[mupen64plus-ui-console] 162/172: Merge branch 'master' into 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-ui-console.

commit 4b3e45719267b394822591f0f322b31eb73d40ee
Merge: 9cf8463 361cbe9
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon Sep 8 21:36:45 2014 +0200

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/mupen64plus-ui-console.install

 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --cc debian/changelog
index 30bac9a,849f8e7..02b2ccd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
 +mupen64plus-ui-console (2.0+18+gfb21340-1) experimental; urgency=medium
 +
 +  * New Upstream Snapshot from fb21340f22ac17a5f1fdcf51a12f228638e5b332
 +  * debian/patches:
 +    - Remove upstream merged make_header_depends.patch
 +  * debian/mupen64plus-ui-console.install:
 +    - Install *.desktop and related files
 +
 + -- Sven Eckelmann <sven at narfation.org>  Fri, 05 Sep 2014 11:53:01 +0200
 +
+ mupen64plus-ui-console (2.0-3) UNRELEASED; urgency=medium
+ 
+   * Install mupen64plus.desktop to associate application/x-n64-rom files with
+     mupen64plus-ui-console
+ 
+  -- Sven Eckelmann <sven at narfation.org>  Mon, 08 Sep 2014 21:32:16 +0200
+ 
  mupen64plus-ui-console (2.0-2) unstable; urgency=low
  
    * debian/patches:

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