[mupen64plus-audio-sdl] 157/163: Merge branch 'experimental'

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-audio-sdl.

commit 8debbef3d72d113d6f47a0749d741fe6b6f42786
Merge: ec486f8 a923175
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Apr 28 22:10:59 2015 +0200

    Merge branch 'experimental'

 .gitattributes                                |  38 +++
 .gitignore                                    |   2 +
 .travis.yml                                   |  21 ++
 debian/changelog                              |  12 +
 projects/msvc11/mupen64plus-audio-sdl.vcxproj | 212 ++++++-------
 projects/msvc8/mupen64plus-audio-sdl.vcproj   | 418 +++++++++++++-------------
 projects/unix/Makefile                        |  29 +-
 src/osal_dynamiclib_win32.c                   | 148 ++++-----
 8 files changed, 475 insertions(+), 405 deletions(-)

diff --cc debian/changelog
index 4830b56,9cf8e56..a1a5981
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,15 +1,24 @@@
+ mupen64plus-audio-sdl (2.0+9+g0bc2238-2) UNRELEASED; urgency=medium
+ 
+   * Update debian/copyright
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Sun, 28 Sep 2014 21:59:20 +0200
+ 
+ mupen64plus-audio-sdl (2.0+9+g0bc2238-1) experimental; urgency=medium
+ 
+   * New Upstream Snapshot from 0bc2238682cfeb249ffd2f47b65b10e65df75c09
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Fri, 05 Sep 2014 10:46:05 +0200
+ 
 +mupen64plus-audio-sdl (2.0-3) UNRELEASED; urgency=medium
 +
 +  * Upgraded to policy 3.9.6, no changes required
 +  * debian/copyright:
 +    - Update years
 +    - Fix errors in paths to specific files
 +
 + -- Sven Eckelmann <sven at narfation.org>  Sat, 20 Sep 2014 11:04:32 +0200
 +
  mupen64plus-audio-sdl (2.0-2) unstable; urgency=low
  
    * Upgraded to policy 3.9.5, no changes required

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