[wxmupen64plus] 20/71: Merge commit 'upstream/0.1+82+5a1d61bc9e40'

[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 4e8fca1637df9e181b450994b23ee2f8f57af206
Merge: a40e2ce b8a33c1
Author: Sven Eckelmann <sven at narfation.org>
Date:   Wed Aug 31 00:06:25 2011 +0200

    Merge commit 'upstream/0.1+82+5a1d61bc9e40'

 .hgignore                  |  13 --
 .hgtags                    |   1 -
 debian/changelog           |   3 +-
 gamespanel.cpp             |  15 +-
 gamespanel.h               |   5 +
 main.cpp                   |  17 +++
 main.h                     |   2 +
 mupen64plusplus/MupenAPI.c |  46 ++++--
 mupen64plusplus/version.h  |   9 +-
 parameterpanel.cpp         | 100 ++++++++++++-
 parameterpanel.h           |   2 +
 sdlkeypicker.cpp           | 351 +++++++++++++++++++++++++++++++++++++--------
 waf                        | Bin
 wscript                    |  20 ++-
 wxMupen64Plus.mk           | 224 -----------------------------
 wxMupen64Plus.project      |  12 +-
 wxvidext.cpp               |  45 ++++--
 17 files changed, 529 insertions(+), 336 deletions(-)

diff --cc debian/changelog
index 3f02e12,0000000..77619fc
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,0 +1,15 @@@
- wxmupen64plus (0.1+20110516-1) UNRELEASED; urgency=low
++wxmupen64plus (0.1+82+5a1d61bc9e40-1) UNRELEASED; urgency=low
 +
 +  * Initial release (Closes: #TODO)
++  * New upstream snapshot from revision 5a1d61bc9e40be7c1b42ae65875743c2ce06556b
 +  * debian/patches:
 +    - Add install_games.patch, Make installpath for wxmupen64plus binary
 +      configurable
 +    - Add wscript_configurable_dir.patch, Add datadir and libdir flags
 +    - Add install_share_path.patch, Install data files to path specified by
 +      datadir
 +  * Update Vcs-* fields to new anonscm.debian.org URLs in debian/control
 +  * Provide search path to plugins and core in debian/rules
 +  * Mark all targets in debian/rules as phony
 +
 + -- 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