[wxmupen64plus] 68/71: Merge tag 'upstream/0.3+40+8410cbda5ff7' into experimental

Sven Eckelmann ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:23:40 UTC 2015


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

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

commit b4adad4972b065c2cf3ba8fc00515995fea19878
Merge: 735c879 d565c14
Author: Sven Eckelmann <sven at narfation.org>
Date:   Wed Jun 5 11:45:37 2013 +0200

    Merge tag 'upstream/0.3+40+8410cbda5ff7' into experimental
    
    Upstream version 0.3+40+8410cbda5ff7

 config.cpp                       |   49 +-
 debian/changelog                 |    3 +-
 gamespanel.cpp                   |   50 +-
 gamespanel.h                     |    3 -
 main.cpp                         |    7 +-
 main.h                           |   11 +
 mupen64plusplus/MupenAPIpp.h     |    8 +-
 parameterpanel.cpp               |  115 ++++-
 parameterpanel.h                 |    4 +
 sdlkeypicker.cpp                 |   18 +-
 sdlkeypicker.h                   |    5 +
 waf                              |   18 +-
 waflib/Build.py                  |  238 ++++++---
 waflib/ConfigSet.py              |   30 +-
 waflib/Configure.py              |   54 +-
 waflib/Context.py                |  104 ++--
 waflib/Errors.py                 |    2 +-
 waflib/Logs.py                   |   66 ++-
 waflib/Node.py                   |  205 ++++----
 waflib/Options.py                |   39 +-
 waflib/Runner.py                 |   45 +-
 waflib/Scripting.py              |  157 +++---
 waflib/Task.py                   |  140 ++++--
 waflib/TaskGen.py                |  201 ++++++--
 waflib/Tools/ar.py               |    1 -
 waflib/Tools/asm.py              |    7 +-
 waflib/Tools/c.py                |    6 +-
 waflib/Tools/c_aliases.py        |    2 +-
 waflib/Tools/c_config.py         |  231 ++++++---
 waflib/Tools/c_osx.py            |   20 +-
 waflib/Tools/c_preproc.py        |   35 +-
 waflib/Tools/c_tests.py          |   75 ++-
 waflib/Tools/ccroot.py           |  294 +++++++----
 waflib/Tools/compiler_c.py       |    2 +-
 waflib/Tools/compiler_cxx.py     |    2 +-
 waflib/Tools/compiler_d.py       |   18 +-
 waflib/Tools/compiler_fc.py      |   10 +-
 waflib/Tools/cs.py               |   64 ++-
 waflib/Tools/cxx.py              |    6 +-
 waflib/Tools/d.py                |   34 +-
 waflib/Tools/d_config.py         |   14 +-
 waflib/Tools/dmd.py              |   25 +-
 waflib/Tools/errcheck.py         |   61 ++-
 waflib/Tools/fc.py               |   10 +-
 waflib/Tools/fc_config.py        |   66 ++-
 waflib/Tools/fc_scan.py          |    5 -
 waflib/Tools/flex.py             |   12 +-
 waflib/Tools/g95.py              |    4 +-
 waflib/Tools/gas.py              |    6 +-
 waflib/Tools/gcc.py              |    5 +-
 waflib/Tools/gdc.py              |    4 +
 waflib/Tools/gfortran.py         |    6 +-
 waflib/Tools/glib2.py            |    5 +-
 waflib/Tools/gnu_dirs.py         |   12 +-
 waflib/Tools/gxx.py              |    5 +-
 waflib/Tools/ifort.py            |   15 +-
 waflib/Tools/intltool.py         |    4 +-
 waflib/Tools/irixcc.py           |    2 +-
 waflib/Tools/javaw.py            |  174 +++++--
 waflib/Tools/kde4.py             |    2 +-
 waflib/Tools/ldc2.py             |   59 +++
 waflib/Tools/log                 | 1007 -------------------------------------
 waflib/Tools/msvc.py             |  491 +++++++++++-------
 waflib/Tools/nasm.py             |    4 +-
 waflib/Tools/perl.py             |   30 +-
 waflib/Tools/python.py           |  192 ++++---
 waflib/Tools/qt4.py              |  274 +++++++---
 waflib/Tools/ruby.py             |   50 +-
 waflib/Tools/suncc.py            |    2 +-
 waflib/Tools/suncxx.py           |    2 +-
 waflib/Tools/tex.py              |  154 ++++--
 waflib/Tools/vala.py             |  357 +++++++------
 waflib/Tools/waf_unit_test.py    |   51 +-
 waflib/Tools/winres.py           |   70 ++-
 waflib/Tools/xlc.py              |    2 +-
 waflib/Tools/xlcxx.py            |    2 +-
 waflib/Utils.py                  |  202 ++++++--
 waflib/ansiterm.py               |   14 +-
 waflib/extras/add_objects.py     |    7 +
 waflib/extras/batched_cc.py      |  161 ++++++
 waflib/extras/biber.py           |   58 +++
 waflib/extras/bjam.py            |  131 +++++
 waflib/extras/boo.py             |   81 +++
 waflib/extras/boost.py           |  360 ++++++++++++++
 waflib/extras/c_bgxlc.py         |   30 ++
 waflib/extras/c_dumbpreproc.py   |   61 +++
 waflib/extras/cabal.py           |  156 ++++++
 waflib/extras/compat15.py        |    3 +-
 waflib/extras/cython.py          |  133 +++++
 waflib/extras/dcc.py             |   79 +++
 waflib/extras/doxygen.py         |  184 +++++++
 waflib/extras/dpapi.py           |   87 ++++
 waflib/extras/dumbpreproc.py     |   61 +++
 waflib/extras/eclipse.py         |  308 ++++++++++++
 waflib/extras/erlang.py          |   19 +
 waflib/extras/fc_bgxlf.py        |   34 ++
 waflib/extras/fc_cray.py         |   51 ++
 waflib/extras/fc_nag.py          |   60 +++
 waflib/extras/fc_open64.py       |   57 +++
 waflib/extras/fc_pgfortran.py    |   66 +++
 waflib/extras/fc_solstudio.py    |   61 +++
 waflib/extras/fc_xlf.py          |   64 +++
 waflib/extras/fluid.py           |   30 ++
 waflib/extras/freeimage.py       |   74 +++
 waflib/extras/fsb.py             |   31 ++
 waflib/extras/fsc.py             |   66 +++
 waflib/extras/gccdeps.py         |  190 +++++++
 waflib/extras/go.py              |  257 ++++++++++
 waflib/extras/gob2.py            |   17 +
 waflib/extras/local_rpath.py     |   19 +
 waflib/extras/lru_cache.py       |   98 ++++
 waflib/extras/make.py            |  142 ++++++
 waflib/extras/md5_tstamp.py      |   70 +++
 waflib/extras/midl.py            |   85 ++++
 waflib/extras/misc.py            |  413 +++++++++++++++
 waflib/extras/msvs.py            | 1021 ++++++++++++++++++++++++++++++++++++++
 waflib/extras/netcache_client.py |  328 ++++++++++++
 waflib/extras/objcopy.py         |   54 ++
 waflib/extras/ocaml.py           |  326 ++++++++++++
 waflib/extras/package.py         |   76 +++
 waflib/extras/parallel_debug.py  |  342 +++++++++++++
 waflib/extras/pep8.py            |  106 ++++
 waflib/extras/pgicc.py           |   69 +++
 waflib/extras/pgicxx.py          |   22 +
 waflib/extras/print_commands.py  |   46 ++
 waflib/extras/proc.py            |   56 +++
 waflib/extras/protoc.py          |   47 ++
 waflib/extras/qnxnto.py          |   74 +++
 waflib/extras/relocation.py      |   85 ++++
 waflib/extras/resx.py            |   35 ++
 waflib/extras/review.py          |  328 ++++++++++++
 waflib/extras/run_do_script.py   |  141 ++++++
 waflib/extras/run_m_script.py    |   89 ++++
 waflib/extras/run_py_script.py   |  106 ++++
 waflib/extras/run_r_script.py    |   87 ++++
 waflib/extras/sas.py             |   71 +++
 waflib/extras/scala.py           |  130 +++++
 waflib/extras/slow_qt4.py        |   95 ++++
 waflib/extras/smart_continue.py  |   81 +++
 waflib/extras/softlink_libs.py   |   74 +++
 waflib/extras/swig.py            |  172 +++++++
 waflib/extras/syms.py            |   71 +++
 waflib/extras/sync_exec.py       |    9 +
 waflib/extras/ticgt.py           |  306 ++++++++++++
 waflib/extras/unity.py           |   54 ++
 waflib/extras/valadoc.py         |  129 +++++
 waflib/extras/why.py             |   73 +++
 waflib/extras/win32_opts.py      |  178 +++++++
 waflib/extras/xcode.py           |  312 ++++++++++++
 waflib/fixpy2.py                 |   14 +-
 wscript                          |   76 ++-
 wxmupen64plus.rc                 |    4 +-
 wxvidext.cpp                     |   25 +-
 153 files changed, 12260 insertions(+), 2635 deletions(-)

diff --cc debian/changelog
index 16faadc,0000000..404f4c5
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,0 +1,5 @@@
- wxmupen64plus (0.3+20+f3a10d673ec5-1) UNRELEASED; urgency=low
++wxmupen64plus (0.3+40+8410cbda5ff7-1) UNRELEASED; urgency=low
 +
 +  * Initial release (Closes: #637771)
-   * Remove obsolete DM-Upload-Allowed in debian/control
 +
 + -- 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



More information about the Pkg-games-commits mailing list