[wxmupen64plus] 07/71: Merge commit 'upstream/0.1+20110510'

[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 362f1296d319589399af260fdad2d0860b938fc2
Merge: 61d37e5 ac25d03
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue May 10 19:01:24 2011 +0200

    Merge commit 'upstream/0.1+20110510'

 License.txt      | 6 +++++-
 debian/changelog | 2 +-
 wscript          | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 2d23f18,0000000..54a2d58
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,0 +1,7 @@@
- wxmupen64plus (0.1+20110430-1) UNRELEASED; urgency=low
++wxmupen64plus (0.1+20110510-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