[mupen64plus-rsp-z64] 134/140: 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-rsp-z64.

commit 53cf290444233efa598f9e1a04534b5aa15d2249
Merge: 2b97557 bf2085b
Author: Sven Eckelmann <sven at narfation.org>
Date:   Tue Apr 28 22:11:02 2015 +0200

    Merge branch 'experimental'

 .gitattributes         | 38 ++++++++++++++++++++++++++++++++++++++
 .gitignore             |  2 ++
 .hg_archival.txt       |  5 -----
 .hgignore              |  4 ----
 .hgtags                |  3 ---
 .travis.yml            | 13 +++++++++++++
 debian/changelog       |  6 ++++++
 projects/unix/Makefile |  4 ++--
 src/main_rsp.cpp       | 12 +++++++++++-
 9 files changed, 72 insertions(+), 15 deletions(-)

diff --cc debian/changelog
index e4fa993,420883c..8c7c0d1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ mupen64plus-rsp-z64 (2.0.0+9+g93dc84f-1) experimental; urgency=medium
+ 
+   * New Upstream Snapshot from 93dc84fd1a7dfb4029f34757fe49027bf167f6ec
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Fri, 05 Sep 2014 11:24:18 +0200
+ 
 +mupen64plus-rsp-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:04:42 +0200
 +
  mupen64plus-rsp-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-rsp-z64.git