[wxmupen64plus] 09/71: Merge commit 'upstream/0.1+20110516'

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch experimental
in repository wxmupen64plus.

commit 0409d9a129a47fb92f9fe6b5f2d2e45c7fbd8575
Merge: 362f129 0b7dfd4
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon May 16 19:20:33 2011 +0200

    Merge commit 'upstream/0.1+20110516'

 debian/changelog               |   2 +-
 gamespanel.cpp                 |  30 ++++++++--
 gamespanel.h                   |   1 +
 main.cpp                       |  25 ++++++---
 mupen64plusplus/MupenAPIpp.cpp |  14 ++---
 mupen64plusplus/MupenAPIpp.h   |   7 ++-
 wscript                        |   5 +-
 wxMupen64Plus.mk               |   8 +--
 wxvidext.cpp                   | 125 +++++++++++++++++++++++++++++++++++++----
 wxvidext.h                     |   2 +
 10 files changed, 178 insertions(+), 41 deletions(-)

diff --cc debian/changelog
index 54a2d58,0000000..7cf84b6
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,0 +1,7 @@@
- wxmupen64plus (0.1+20110510-1) UNRELEASED; urgency=low
++wxmupen64plus (0.1+20110516-1) UNRELEASED; urgency=low
 +
 +  * Initial release (Closes: #TODO)
 +  * debian/patches:
 +    - Add install_games.patch, Install under /usr/games
 +
 + -- Sven Eckelmann <sven at narfation.org>  Mon, 17 Aug 2009 10:18:49 +0200

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