[wxmupen64plus] 65/71: Merge tag 'upstream/0.3+20+f3a10d673ec5' into experimental

[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 65216c2ce59cf8635f79218d7fb4f66c33fcd896
Merge: 9f70701 1411d78
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Oct 20 15:40:36 2012 +0200

    Merge tag 'upstream/0.3+20+f3a10d673ec5' into experimental
    
    Upstream version 0.3+20+f3a10d673ec5

 debian/changelog               | 2 +-
 main.cpp                       | 2 +-
 mupen64plusplus/MupenAPIpp.cpp | 8 ++++++++
 wscript                        | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 2386e65,0000000..1b93a5b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,5 @@@
- wxmupen64plus (0.3+17+7b283c0ad22f-1) UNRELEASED; urgency=low
++wxmupen64plus (0.3+20+f3a10d673ec5-1) UNRELEASED; urgency=low
 +
 +  * Initial release (Closes: #637771)
 +
 + -- 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