[mupen64plus-video-z64] 153/161: 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-video-z64.

commit 34f7499dfd1d9f4e11b010140d56869a1b2480ea
Merge: 56b4528 c66aef8
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Apr 28 22:11:07 2015 +0200

    Merge branch 'experimental'

 .gitattributes              |  38 ++++++++++++
 .gitignore                  |   2 +
 .hg_archival.txt            |   5 --
 .hgignore                   |   4 --
 .hgtags                     |   3 -
 .travis.yml                 |  12 ++++
 debian/changelog            |   6 ++
 projects/unix/Makefile      |   6 +-
 src/osal_dynamiclib_win32.c | 148 ++++++++++++++++++++++----------------------
 9 files changed, 135 insertions(+), 89 deletions(-)

diff --cc debian/changelog
index 7f6fab0,88a99f0..048ac8c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ mupen64plus-video-z64 (2.0.0+9+gb0a0b5f-1) experimental; urgency=medium
+ 
+   * New Upstream Snapshot from b0a0b5f999e8a115f8d0301d38f85d0e5032e0a7
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Fri, 05 Sep 2014 12:33:01 +0200
+ 
 +mupen64plus-video-z64 (2.0.0-3) 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:05:00 +0200
 +
  mupen64plus-video-z64 (2.0.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-video-z64.git