[mupen64plus-video-arachnoid] 141/147: Merge branch 'experimental'
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:09:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-arachnoid.
commit 4bb8fe2769f0de48f90b12cf4ef1f49c73f8f7a2
Merge: c8457a6 67dbd60
Author: Sven Eckelmann <sven at narfation.org>
Date: Tue Apr 28 22:11:04 2015 +0200
Merge branch 'experimental'
.gitattributes | 38 +
.gitignore | 2 +
.hg_archival.txt | 5 -
.hgignore | 4 -
.hgtags | 3 -
.travis.yml | 10 +
README | 2 +-
debian/changelog | 6 +
projects/msvc9/GraphicsPlugin.sln | 38 +-
projects/msvc9/GraphicsPlugin.vcproj | 1844 +++++++++++++++---------------
projects/unix/Makefile | 4 +-
src/Assembler/assembler.h | 2 +-
src/Combiner/AdvancedCombinerManager.cpp | 2 +-
src/Combiner/AdvancedCombinerManager.h | 2 +-
src/Combiner/AdvancedTexEnvCombiner.cpp | 2 +-
src/Combiner/AdvancedTexEnvCombiner.h | 2 +-
src/Combiner/CombinerBase.cpp | 2 +-
src/Combiner/CombinerBase.h | 2 +-
src/Combiner/CombinerCache.cpp | 2 +-
src/Combiner/CombinerCache.h | 2 +-
src/Combiner/CombinerStageCreator.cpp | 2 +-
src/Combiner/CombinerStageCreator.h | 2 +-
src/Combiner/CombinerStageMerger.cpp | 2 +-
src/Combiner/CombinerStageMerger.h | 2 +-
src/Combiner/CombinerStructs.h | 2 +-
src/Combiner/DummyCombiner.cpp | 2 +-
src/Combiner/DummyCombiner.h | 2 +-
src/Combiner/SimpleTexEnvCombiner.cpp | 2 +-
src/Combiner/SimpleTexEnvCombiner.h | 2 +-
src/DisplayListParser.cpp | 2 +-
src/DisplayListParser.h | 2 +-
src/ExtensionChecker.cpp | 2 +-
src/ExtensionChecker.h | 2 +-
src/FogManager.cpp | 2 +-
src/FogManager.h | 2 +-
src/GBI/GBI.cpp | 2 +-
src/GBI/GBI.h | 2 +-
src/GBI/GBIDefs.h | 2 +-
src/GraphicsPlugin.cpp | 2 +-
src/GraphicsPlugin.h | 2 +-
src/Memory.cpp | 2 +-
src/Memory.h | 2 +-
src/MultiTexturingExt.cpp | 2 +-
src/MultiTexturingExt.h | 2 +-
src/N64Games.h | 2 +-
src/OpenGL.h | 2 +-
src/OpenGLManager.cpp | 2 +-
src/OpenGLManager.h | 2 +-
src/RDP/RDP.cpp | 2 +-
src/RDP/RDP.h | 2 +-
src/RDP/RDPInstructions.cpp | 2 +-
src/RDP/RDPInstructions.h | 2 +-
src/RDP/RDPUCodeStructs.h | 2 +-
src/RSP/RSP.cpp | 2 +-
src/RSP/RSP.h | 2 +-
src/RSP/RSPLightManager.cpp | 2 +-
src/RSP/RSPLightManager.h | 2 +-
src/RSP/RSPMatrixManager.cpp | 2 +-
src/RSP/RSPMatrixManager.h | 2 +-
src/RSP/RSPVertexManager.cpp | 2 +-
src/RSP/RSPVertexManager.h | 2 +-
src/RomDetector.cpp | 2 +-
src/RomDetector.h | 2 +-
src/SecondaryColorExt.cpp | 2 +-
src/SecondaryColorExt.h | 2 +-
src/UCodeDefs.h | 2 +-
src/VI.cpp | 2 +-
src/VI.h | 2 +-
src/config/Config.cpp | 2 +-
src/config/Config.h | 2 +-
src/config/ConfigMap.h | 2 +-
src/config/StringFunctions.cpp | 2 +-
src/config/StringFunctions.h | 2 +-
src/config/StringValue.h | 2 +-
src/framebuffer/FrameBuffer.cpp | 2 +-
src/framebuffer/FrameBuffer.h | 2 +-
src/hash/CRCCalculator.cpp | 2 +-
src/hash/CRCCalculator.h | 2 +-
src/hash/CRCCalculator2.cpp | 2 +-
src/hash/CRCCalculator2.h | 2 +-
src/log/Logger.cpp | 2 +-
src/log/Logger.h | 2 +-
src/m64p.h | 2 +-
src/main.cpp | 2 +-
src/math/MathLib.h | 2 +-
src/math/Matrix4.cpp | 2 +-
src/math/Matrix4.h | 2 +-
src/osal_dynamiclib_win32.cpp | 146 +--
src/renderer/OpenGL2DRenderer.cpp | 2 +-
src/renderer/OpenGL2DRenderer.h | 2 +-
src/renderer/OpenGLRenderer.cpp | 2 +-
src/renderer/OpenGLRenderer.h | 2 +-
src/texture/CachedTexture.cpp | 2 +-
src/texture/CachedTexture.h | 2 +-
src/texture/ImageFormatSelector.cpp | 2 +-
src/texture/ImageFormatSelector.h | 2 +-
src/texture/TextureCache.cpp | 2 +-
src/texture/TextureCache.h | 2 +-
src/texture/TextureLoader.cpp | 2 +-
src/texture/TextureLoader.h | 2 +-
src/ucodes/UCode0.cpp | 2 +-
src/ucodes/UCode0.h | 2 +-
src/ucodes/UCode1.cpp | 2 +-
src/ucodes/UCode1.h | 2 +-
src/ucodes/UCode10.cpp | 2 +-
src/ucodes/UCode10.h | 2 +-
src/ucodes/UCode2.cpp | 2 +-
src/ucodes/UCode2.h | 2 +-
src/ucodes/UCode4.cpp | 2 +-
src/ucodes/UCode4.h | 2 +-
src/ucodes/UCode5.cpp | 2 +-
src/ucodes/UCode5.h | 2 +-
src/ucodes/UCode6.cpp | 2 +-
src/ucodes/UCode6.h | 2 +-
src/ucodes/UCode7.cpp | 2 +-
src/ucodes/UCode7.h | 2 +-
src/ucodes/UCode9.cpp | 2 +-
src/ucodes/UCode9.h | 2 +-
src/ucodes/UCodeIdentificationData.h | 2 +-
src/ucodes/UCodeSelector.cpp | 2 +-
src/ucodes/UCodeSelector.h | 2 +-
src/utils/MemoryLeakDetector.h | 2 +-
122 files changed, 1183 insertions(+), 1139 deletions(-)
diff --cc debian/changelog
index 3fa0941,0375bbd..b4aeb7e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ mupen64plus-video-arachnoid (2.0.0+8+g7378184-1) experimental; urgency=medium
+
+ * New Upstream Snapshot from 7378184970723511b389a4939e0bb2f989b1eb5e
+
+ -- Sven Eckelmann <sven at narfation.org> Fri, 05 Sep 2014 12:09:14 +0200
+
+mupen64plus-video-arachnoid (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:47 +0200
+
mupen64plus-video-arachnoid (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-arachnoid.git
More information about the Pkg-games-commits
mailing list