[mupen64plus-video-glide64] 165/172: Merge branch 'experimental'

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-glide64.

commit 0509010515c0c4a3693ece8cf4527b79b3929c5d
Merge: 6a8838b 0bbe44c
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Apr 28 22:11:05 2015 +0200

    Merge branch 'experimental'

 .gitattributes                                  |   38 +
 .gitignore                                      |    2 +
 .hg_archival.txt                                |    5 -
 .hgignore                                       |    4 -
 .hgtags                                         |    3 -
 .travis.yml                                     |   15 +
 debian/changelog                                |    8 +
 debian/patches/llvm_builtin_ftbfs.patch         |   37 -
 debian/patches/printf_fixup.patch               |    2 +-
 debian/patches/series                           |    1 -
 projects/msvc9/mupen64plus-video-glide64.sln    |   40 +-
 projects/msvc9/mupen64plus-video-glide64.vcproj |  906 ++---
 projects/unix/Makefile                          |   13 +-
 src/3dmath.cpp                                  |   12 +-
 src/DepthBufferRender.cpp                       |   17 +-
 src/Main.cpp                                    |    6 +-
 src/MiClWr16b.h                                 |  429 +--
 src/MiClWr8b.h                                  |  482 +--
 src/TexCache.cpp                                |   97 +-
 src/TexConv.h                                   |  562 +--
 src/TexLoad.h                                   |    4 +-
 src/TexLoad16b.h                                |  539 ++-
 src/TexLoad32b.h                                |  481 +--
 src/TexLoad4b.h                                 | 4290 ++++-------------------
 src/TexLoad8b.h                                 | 1575 +++------
 src/Util.h                                      |   40 +
 src/m64p.h                                      |    2 +-
 src/osal_dynamiclib_win32.c                     |  148 +-
 src/rdp.cpp                                     |   15 -
 29 files changed, 2492 insertions(+), 7281 deletions(-)

diff --cc debian/changelog
index d511c40,4520834..228917e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,18 @@@
+ mupen64plus-video-glide64 (2.0.0+27+gd644aca-1) experimental; urgency=medium
+ 
+   * New Upstream Snapshot from d644acacb44313b5b7d9dfac9324925327eb14dd
+   * debian/patches:
+     - Remove upstream merged llvm_builtin_ftbfs.patch
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Fri, 05 Sep 2014 12:15:10 +0200
+ 
 +mupen64plus-video-glide64 (2.0.0-3) UNRELEASED; urgency=medium
 +
 +  * Upgraded to policy 3.9.6, no changes required
 +  * Update years in debian/copyright
 +
 + -- Sven Eckelmann <sven at narfation.org>  Sat, 20 Sep 2014 11:04:50 +0200
 +
  mupen64plus-video-glide64 (2.0.0-2) unstable; urgency=low
  
    * Upgraded to policy 3.9.5, no changes required

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64.git