[mupen64plus-video-arachnoid] 100/147: Merge tag 'upstream/1.99.5+4+28e9cf4a672f' into 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-arachnoid.

commit fcc14295859b4e0a41960afeff0ed2508e768055
Merge: 880dfcf ae02045
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Dec 2 21:57:36 2012 +0100

    Merge tag 'upstream/1.99.5+4+28e9cf4a672f' into experimental
    
    Upstream version 1.99.5+4+28e9cf4a672f
    
    # gpg: Signature made Sun 02 Dec 2012 09:57:35 PM CET using RSA key ID C1267B46
    # gpg: Good signature from "Sven Eckelmann <sven at narfation.org>"
    # gpg:                 aka "Sven Eckelmann <ecsv at hrz.tu-chemnitz.de>"
    # gpg:                 aka "Sven Eckelmann <ecsv at informatik.tu-chemnitz.de>"
    # gpg:                 aka "Sven Eckelmann <sven.eckelmann at s2004.tu-chemnitz.de>"
    # gpg:                 aka "Sven Eckelmann <sven.eckelmann at informatik.tu-chemnitz.de>"

 .hg_archival.txt                     |  5 -----
 .hgignore                            |  4 ----
 .hgtags                              |  2 --
 projects/unix/Makefile               | 10 +++++++++-
 src/Combiner/CombinerStageCreator.h  |  2 +-
 src/ExtensionChecker.h               |  2 +-
 src/ucodes/UCode1.h                  |  2 +-
 src/ucodes/UCode10.h                 |  2 +-
 src/ucodes/UCode4.h                  |  2 +-
 src/ucodes/UCode7.h                  |  2 +-
 src/ucodes/UCodeIdentificationData.h |  2 +-
 11 files changed, 16 insertions(+), 19 deletions(-)

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