[SCM] packaging for the mame arcade game emulator branch, master, updated. 733f06d81b117837a5fd10308c15e23c3b5603fc

[Jordi Mallach]

The following commit has been merged in the master branch:
commit 733f06d81b117837a5fd10308c15e23c3b5603fc
Merge: bb00ab52364c5266132efa891fa43a9062cbe456 1c3564209de59c0a818da10ad6c0b5c3bd829989
Author: Jordi Mallach <jordi at debian.org>
Date:   Sun Jan 15 23:20:11 2012 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-games/mame
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index c780546,7f794ef..cd3500e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,12 @@@
  mame (0.144-2) UNRELEASED; urgency=low
  
++  [ Emmanuel Kasper ]
+   * Yet another batch of syntax errors in DEP5 copyright file corrected
+ 
 - -- Emmanuel Kasper <emmanuel at libera.cc>  Wed, 28 Dec 2011 13:27:34 +0100
++  [ Jordi Mallach ]
 +  * gnu_fixes.patch: Add a check for __GNU__ to fix builds on the Hurd.
 +
 + -- Jordi Mallach <jordi at debian.org>  Sun, 15 Jan 2012 23:14:16 +0100
  
  mame (0.144-1) unstable; urgency=low
  

-- 
packaging for the mame arcade game emulator