[mame] 01/07: Merge changelogs.

[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 0edc4de1c9eff032b6c1dc9e6de23803def588be
Author: Jordi Mallach <jordi at debian.org>
Date:   Mon Jul 4 15:49:30 2016 +0200

    Merge changelogs.
---
 debian/changelog | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b29efe..3c13bdd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,14 @@
 mame (0.174-1) UNRELEASED; urgency=medium
 
+  [ Cesare Falco ]
   * New upstream release (LP: #1590678) (LP: #1562705)
   * Removed patches now included upstream
-
- -- Cesare Falco <c.falco at ubuntu.com>  Sat, 04 Jun 2016 09:16:26 +0200
-
-mame (0.173-7) UNRELEASED; urgency=medium
-
-  [ Cesare Falco ]
   * debian/rules:
     - x32 has 32bit pointers, split amd64 rule
     - reduce memory required by ld on all archs (Ubuntu)
     - remove -g gcc switch when no DEBUG required
 
- -- Jordi Mallach <jordi at debian.org>  Mon, 23 May 2016 10:37:40 +0200
+ -- Cesare Falco <c.falco at ubuntu.com>  Sat, 04 Jun 2016 09:16:26 +0200
 
 mame (0.173-6) unstable; urgency=medium
 

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