[mupen64plus-input-sdl] 182/196: Merge branch 'experimental'

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus-input-sdl.

commit 3b566e6c66a87934abc01e096789f48f10ea887e
Merge: bbd7245 f45cd50
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Apr 28 22:11:01 2015 +0200

    Merge branch 'experimental'

 .gitattributes                                     |  38 +
 .gitignore                                         |   2 +
 .travis.yml                                        |  15 +
 README                                             |  69 +-
 data/InputAutoCfg.ini                              | 401 +++++++++-
 debian/changelog                                   |  16 +
 debian/patches/autoconfig_acrux.patch              |  42 --
 .../patches/autoconfig_austgame_ps_converter.patch |  40 -
 debian/patches/autoconfig_bda_pro_ex.patch         |  40 -
 debian/patches/autoconfig_ipequa.patch             |  61 --
 debian/patches/autoconfig_jess_controller.patch    |  48 --
 debian/patches/autoconfig_logitech_f310.patch      |  16 -
 debian/patches/autoconfig_mayflash.patch           |  26 -
 .../autoconfig_nintendo_wii_remote_pro.patch       |  40 -
 debian/patches/autoconfig_retrolink_n64.patch      |  41 --
 .../autoconfig_sidewinder_gamepad_pro.patch        |  37 -
 debian/patches/autoconfig_sony_dualshock4.patch    |   2 +-
 debian/patches/autoconfig_szmy_gamepad3.patch      |  40 -
 debian/patches/autoconfig_twin_gamepad.patch       |  88 ---
 debian/patches/autoconfig_twin_usb.patch           |  42 --
 debian/patches/autoconfig_wiimote_classic.patch    |  40 -
 debian/patches/autoconfig_xbox360.patch            |  17 -
 debian/patches/autoconfig_xinput.patch             |  44 --
 debian/patches/fallback_nomousegrab.patch          |  51 --
 debian/patches/sdl2_forcefeedback.patch            | 218 ------
 debian/patches/sdl2_keysym.patch                   | 819 ---------------------
 debian/patches/sdl2_mousemode.patch                |  88 ---
 debian/patches/series                              |  20 -
 debian/patches/xboxdrv_rumble_war.patch            |   2 +-
 projects/msvc11/mupen64plus-input-sdl.vcxproj      | 226 +++---
 projects/msvc8/mupen64plus-input-sdl.vcproj        | 472 ++++++------
 projects/unix/Makefile                             |  30 +-
 src/autoconfig.c                                   | 132 ++--
 src/config.c                                       |  22 +-
 src/osal_dynamiclib_win32.c                        | 148 ++--
 src/osal_preproc.h                                 |  12 +
 src/plugin.c                                       | 195 ++++-
 src/plugin.h                                       |   5 +
 src/sdl_key_converter.c                            | 652 ++++++++++++++++
 src/{osal_preproc.h => sdl_key_converter.h}        |  41 +-
 40 files changed, 1898 insertions(+), 2440 deletions(-)

diff --cc debian/changelog
index db0cbaf,6ab35fa..6bd0d43
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,19 +1,26 @@@
+ mupen64plus-input-sdl (2.0+50+g83c33be-1) experimental; urgency=medium
+ 
+   * New Upstream Snapshot from 83c33bee6921bae966cced52c8e4662a457918d9
+   * Remove upstream merged autoconfig_acrux.patch,
+     autoconfig_austgame_ps_converter.patch, autoconfig_bda_pro_ex.patch,
+     autoconfig_ipequa.patch, autoconfig_jess_controller.patch,
+     autoconfig_logitech_f310.patch, autoconfig_mayflash.patch,
+     autoconfig_nintendo_wii_remote_pro.patch, autoconfig_retrolink_n64.patch,
+     autoconfig_sidewinder_gamepad_pro.patch, autoconfig_szmy_gamepad3.patch,
+     autoconfig_twin_gamepad.patch, autoconfig_twin_usb.patch,
+     autoconfig_wiimote_classic.patch, autoconfig_xbox360.patch,
+     autoconfig_xinput.patch, fallback_nomousegrab.patch,
+     sdl2_forcefeedback.patch, sdl2_keysym.patch, sdl2_mousemode.patch
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Fri, 05 Sep 2014 11:01:32 +0200
+ 
 +mupen64plus-input-sdl (2.0-5) UNRELEASED; urgency=medium
 +
 +  * Upgraded to policy 3.9.6, no changes required
 +  * Update years in debian/copyright
 +
 + -- Sven Eckelmann <sven at narfation.org>  Sat, 20 Sep 2014 11:04:38 +0200
 +
  mupen64plus-input-sdl (2.0-4) unstable; urgency=medium
  
    * debian/watch:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-input-sdl.git