[mupen64plus-video-rice] 181/191: Merge branch 'experimental'

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-video-rice.

commit 4c03d635d30061c0c74af21ef957cf413caeb735
Merge: 600a1e5 06244aa
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Apr 28 22:11:06 2015 +0200

    Merge branch 'experimental'

 .gitattributes                                 |   38 +
 .gitignore                                     |    2 +
 .travis.yml                                    |   15 +
 debian/changelog                               |   10 +
 debian/control                                 |    4 +-
 debian/patches/series                          |    1 -
 debian/patches/tnt_cominber.patch              |   16 -
 projects/msvc11/mupen64plus-video-rice.vcxproj |  424 ++++----
 projects/msvc8/mupen64plus-video-rice.vcproj   | 1272 ++++++++++++------------
 projects/unix/Makefile                         |   46 +-
 src/CNvTNTCombiner.cpp                         |  325 ------
 src/CNvTNTCombiner.h                           |   94 --
 src/Combiner.cpp                               |    7 -
 src/Combiner.h                                 |    3 +-
 src/Config.cpp                                 |  132 +--
 src/Config.h                                   |   31 +-
 src/Debugger.cpp                               |   11 +-
 src/DeviceBuilder.cpp                          |  112 +--
 src/DirectXDecodedMux.cpp                      |  169 ----
 src/DirectXDecodedMux.h                        |   32 -
 src/FrameBuffer.cpp                            |   10 -
 src/GraphicsContext.cpp                        |    9 +-
 src/GraphicsContext.h                          |   17 -
 src/OGLCombiner.cpp                            |    3 +-
 src/OGLCombinerNV.cpp                          | 1146 ---------------------
 src/OGLCombinerNV.h                            |  158 ---
 src/OGLCombinerTNT2.cpp                        |  332 -------
 src/OGLCombinerTNT2.h                          |   69 --
 src/OGLDebug.h                                 |    2 +-
 src/OGLDecodedMux.cpp                          |   18 -
 src/OGLDecodedMux.h                            |    6 -
 src/OGLES2FragmentShaders.cpp                  |  158 +--
 src/OGLES2FragmentShaders.h                    |   43 +-
 src/OGLExtCombiner.cpp                         |  601 ++---------
 src/OGLExtCombiner.h                           |   57 --
 src/OGLExtRender.cpp                           |   20 +-
 src/OGLExtensions.cpp                          |   30 +-
 src/OGLExtensions.h                            |   23 +-
 src/OGLFragmentShaders.cpp                     |   54 -
 src/OGLFragmentShaders.h                       |   27 -
 src/OGLGraphicsContext.cpp                     |   56 +-
 src/OGLGraphicsContext.h                       |   38 +-
 src/OGLRender.cpp                              |  245 ++---
 src/OGLRender.h                                |    4 -
 src/OGLRenderExt.cpp                           |   12 +
 src/RDP_Texture.h                              |    6 -
 src/RSP_GBI0.h                                 |   17 +-
 src/RSP_GBI1.h                                 |    2 -
 src/Render.cpp                                 |   37 +-
 src/Render.h                                   |    3 -
 src/RenderBase.cpp                             |  101 +-
 src/RenderBase.h                               |    2 +-
 src/TextureFilters.cpp                         |  117 +--
 src/VertexShaderConstantDef.h                  |   91 --
 src/Video.cpp                                  |   12 +-
 src/Video.h                                    |    4 +-
 src/liblinux/pngrw.c                           |    1 +
 src/osal_dynamiclib_win32.c                    |  148 +--
 src/osal_files_win32.c                         |  290 +++---
 src/osal_opengl.h                              |   20 +-
 src/version.h                                  |    2 +-
 61 files changed, 1599 insertions(+), 5136 deletions(-)

diff --cc debian/changelog
index 247ae49,55a10ad..c1d1eeb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,13 +1,20 @@@
+ mupen64plus-video-rice (2.0+57+g134f5dc-1) experimental; urgency=medium
+ 
+   * New Upstream Snapshot from 134f5dc1e7d12fb4996a1129b63861174596777c
+   * debian/control:
+     - Depend on mupen64plus-config-abi-2.3 for ConfigSetParameterHelp
+   * debian/patches:
+     - Remve upstream merged tnt_cominber.patch
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Fri, 05 Sep 2014 12:21:30 +0200
+ 
 +mupen64plus-video-rice (2.0-4) 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:57 +0200
 +
  mupen64plus-video-rice (2.0-3) unstable; urgency=medium
  
    * Update copyright years in debian/copyright

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