[wxmupen64plus] 33/71: Merge tag 'upstream/0.3'

[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 74b6061114d10192ca08144f5b6db521f34f6700
Merge: 98425c2 2f655b0
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon May 7 20:53:00 2012 +0200

    Merge tag 'upstream/0.3'
    
    Upstream version 0.3

 .hg_archival.txt                        |   4 +
 .hgignore                               |  14 +
 .hgtags                                 |   3 +
 Info.plist                              |   6 +-
 Mupen additional config info.txt        |   8 -
 config.cpp                              |  74 ++-
 debian/changelog                        |   2 +-
 gamespanel.cpp                          | 153 ++----
 gamespanel.h                            |   4 +-
 main.cpp                                |  13 +-
 mupen64plusplus/MupenAPI.c.orig         | 930 --------------------------------
 mupen64plusplus/MupenAPIpp.cpp          | 206 +++++--
 mupen64plusplus/MupenAPIpp.h            |  46 +-
 mupen64plusplus/osal_dynamiclib_win32.c | 148 ++---
 mupen64plusplus/osal_files_win32.c      | 210 ++++----
 mupen64plusplus/plugin.c                |   3 +-
 ownerptr.h                              | 109 ++++
 parameterpanel.cpp                      | 198 +++++--
 sdlkeypicker.h                          |   5 +
 wscript                                 |  34 +-
 wxMupen64Plus.project                   | 131 +++++
 wxMupen64PlusWin.project                | 127 +++++
 wxmupen.iss                             | 168 +++---
 wxvidext.cpp                            |   9 +-
 24 files changed, 1196 insertions(+), 1409 deletions(-)

diff --cc debian/changelog
index 13ddf30,0000000..38c8c4f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,0 +1,6 @@@
- wxmupen64plus (0.2-1) UNRELEASED; urgency=low
++wxmupen64plus (0.3-1) UNRELEASED; urgency=low
 +
 +  * Initial release (Closes: #637771)
 +  * Update copyright years in debian/copyright
 +
 + -- 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