[mame] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-games/mame

[Jordi Mallach]

This is an automated email from the git hooks/post-receive script.

jordi pushed a commit to branch master
in repository mame.

commit a46cf1ba0993f7072ecbbb6225bf302c4d5bc260
Merge: 4ee5a5a e32d642
Author: Jordi Mallach <jordi at debian.org>
Date:   Fri Dec 9 13:13:45 2016 +0100

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

 debian/changelog                          |  6 ++++++
 debian/patches/genie_freebsd_target.patch |  2 +-
 debian/patches/hurd.patch                 | 19 +++----------------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index 7c2e02d,6878cb6..f5b1215
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,10 @@@
+ mame (0.180-1) UNRELEASED; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Cesare Falco <c.falco at ubuntu.com>  Wed, 30 Nov 2016 09:26:17 +0100
+ 
 -mame (0.179-2) UNRELEASED; urgency=medium
 +mame (0.179-2) unstable; urgency=medium
  
    * Add -fPIC to arm64 ARCHOPTS to workaround yet another build issue.
    * Add m68000_archopts.patch: Add $(ARCHOPTS) to compiler invocation in the

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