[mame-extra] 02/07: Merge tag 'upstream/0.180'

[Jordi Mallach]

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

jordi pushed a commit to branch master
in repository mame-extra.

commit fb1b605ef48fa3322c95da1173ab5bec2d2c315c
Merge: 2afc319 0c541a9
Author: Jordi Mallach <jordi at debian.org>
Date:   Mon Dec 26 21:17:19 2016 +0100

    Merge tag 'upstream/0.180'
    
    Upstream version 0.180

 history/history.dat        | 35115 ++++++++++++++++++++++++++-----------------
 nplayers/docs/nplayers.txt |    13 +-
 nplayers/nplayers.ini      |   744 +-
 3 files changed, 21584 insertions(+), 14288 deletions(-)

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