[mupen64plus-video-z64] 109/161: Merge tag 'upstream/1.99.5+18+7c782be6fc7c' 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-z64.

commit 7067218cf1a762e212857e1bce6e4349355572e7
Merge: fd58b80 857f857
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Feb 8 09:47:54 2013 +0100

    Merge tag 'upstream/1.99.5+18+7c782be6fc7c' into experimental
    
    Upstream version 1.99.5+18+7c782be6fc7c
    
    # gpg: Signature made Fri 08 Feb 2013 09:47:54 AM 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>"

 projects/unix/Makefile | 108 +++++++++++++++++++++++++++++++++++--------------
 src/glshader.cpp       |  14 ++++++-
 src/maingl.cpp         |   2 +-
 src/rgl.cpp            |   2 +-
 src/rgl.h              |   8 +++-
 src/rgl_debugger.cpp   |   2 +-
 src/rgl_geometry.cpp   |   2 +-
 src/rgl_glut.cpp       |   2 +-
 src/rgl_osdep.cpp      |   2 +-
 src/rgl_rendermode.cpp |   2 +-
 src/rgl_tiles.cpp      |   2 +-
 11 files changed, 105 insertions(+), 41 deletions(-)

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