The following commit has been merged in the master branch:
commit d41770b9548cfb68ca6e2276805d52e67269955f
Merge: 24d4cb92f2f501035cb2b5afae99d6a5255ce99a
dc3bc69563c90f6babb3f4dcf4d2de4770358ce4
Author: Etienne Millon <[email protected]>
Date: Tue Jul 3 13:17:00 2012 +0200
Merge remote-tracking branch 'alioth/master'
* alioth/master:
Improve zsnes.desktop file, thanks to Fabian Greffrath (Closes: #680054)
diff --combined debian/changelog
index aa9e6e1,c581650..f5c9cb8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -6,10 -6,13 +6,13 @@@ zsnes (1.510+bz2-4) UNRELEASED; urgency
(thanks to Fabian Greffrath & Goswin von Brederlow - Closes: #679826)
* debian/compat : use level 9 compatibility level
* debian/rules :
- - use find -delete instead of shell globbing
+ - use find -delete instead of command expansion
- use dpkg-buildflags
- add -Wl,--as-needed to LDFLAGS (Closes: #607311)
+ [ Eshat Cakar ]
+ * Improve zsnes.desktop file, thanks to Fabian Greffrath (Closes: #680054)
+
-- Etienne Millon <[email protected]> Fri, 29 Jun 2012 17:37:53 +0200
zsnes (1.510+bz2-3) unstable; urgency=low
--
Emulator of the Super Nintendo Entertainment System (TM)
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
