[mupen64plus] 59/262: Merge commit 'upstream/1.5+dfsg1'

[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.

commit c2c89a54652a80e4d4b9782fd942a332442e38fe
Merge: 383a461 991e5ca
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Wed Jun 3 17:26:56 2009 +0200

    Merge commit 'upstream/1.5+dfsg1'

 config/glN64.conf                  |   10 -
 glN64/2xSAI.cpp                    |  647 --------------
 glN64/2xSAI.h                      |    9 -
 glN64/3DMath.h                     |  117 ---
 glN64/CRC.cpp                      |   66 --
 glN64/CRC.h                        |   11 -
 glN64/Combiner.cpp                 |  414 ---------
 glN64/Combiner.h                   |  384 --------
 glN64/Config.h                     |    9 -
 glN64/Config_gtk2.cpp              |  536 ------------
 glN64/Config_nogui.cpp             |  210 -----
 glN64/Config_qt4.cpp               |  277 ------
 glN64/Debug.h                      |   47 -
 glN64/DepthBuffer.cpp              |  167 ----
 glN64/DepthBuffer.h                |   28 -
 glN64/F3D.cpp                      |  382 --------
 glN64/F3D.h                        |   97 ---
 glN64/F3DDKR.cpp                   |  122 ---
 glN64/F3DDKR.h                     |   14 -
 glN64/F3DEX.cpp                    |   90 --
 glN64/F3DEX.h                      |   54 --
 glN64/F3DEX2.cpp                   |  289 -------
 glN64/F3DEX2.h                     |   88 --
 glN64/F3DPD.cpp                    |   59 --
 glN64/F3DPD.h                      |    8 -
 glN64/F3DWRUS.cpp                  |   73 --
 glN64/F3DWRUS.h                    |    8 -
 glN64/FrameBuffer.cpp              |  425 ---------
 glN64/FrameBuffer.h                |   36 -
 glN64/GBI.cpp                      |  504 -----------
 glN64/GBI.h                        |  787 -----------------
 glN64/L3D.cpp                      |   57 --
 glN64/L3D.h                        |   10 -
 glN64/L3DEX.cpp                    |   61 --
 glN64/L3DEX.h                      |    8 -
 glN64/L3DEX2.cpp                   |   61 --
 glN64/L3DEX2.h                     |   10 -
 glN64/Makefile                     |  113 ---
 glN64/N64.cpp                      |   16 -
 glN64/N64.h                        |   45 -
 glN64/NV_register_combiners.cpp    |  601 -------------
 glN64/NV_register_combiners.h      |   79 --
 glN64/OpenGL.cpp                   | 1238 --------------------------
 glN64/OpenGL.h                     |  160 ----
 glN64/RDP.cpp                      |  294 -------
 glN64/RDP.h                        |    7 -
 glN64/RSP.cpp                      |  211 -----
 glN64/RSP.h                        |   53 --
 glN64/S2DEX.cpp                    |  102 ---
 glN64/S2DEX.h                      |  219 -----
 glN64/S2DEX2.cpp                   |   45 -
 glN64/S2DEX2.h                     |   20 -
 glN64/Textures.cpp                 | 1144 ------------------------
 glN64/Textures.h                   |   91 --
 glN64/Types.h                      |   40 -
 glN64/VI.cpp                       |   80 --
 glN64/VI.h                         |   17 -
 glN64/Zilmar GFX 1.3.h             |  306 -------
 glN64/convert.h                    |  298 -------
 glN64/gDP.cpp                      |  942 --------------------
 glN64/gDP.h                        |  281 ------
 glN64/gSP.cpp                      | 1681 ------------------------------------
 glN64/gSP.h                        |  153 ----
 glN64/glN64.cpp                    |  433 ----------
 glN64/glN64.h                      |   34 -
 glN64/gln64config.ui               |  389 ---------
 glN64/texture_env.cpp              |  186 ----
 glN64/texture_env.h                |   23 -
 glN64/texture_env_combine.cpp      |  627 --------------
 glN64/texture_env_combine.h        |   79 --
 glide64/icons/messagebox-error.xpm |  259 ------
 glide64/icons/messagebox-info.xpm  |  620 -------------
 glide64/icons/messagebox-quest.xpm |  549 ------------
 glide64/icons/messagebox-warn.xpm  |  340 --------
 roms/mupen64plus.v64.gz            |  Bin 76828 -> 0 bytes
 75 files changed, 17950 deletions(-)

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