[mame-extra] 08/10: Merge tag 'upstream/0.184'

[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 12dea836de849827f45b699eea1c3f7c202e2017
Merge: 918dbe6 4808b9d
Author: Jordi Mallach <jordi at debian.org>
Date:   Fri Apr 7 08:30:15 2017 +0200

    Merge tag 'upstream/0.184'
    
    Upstream version 0.184

 history/history.dat        | 54493 +++++++++++++++++++++++++++++++------------
 nplayers/docs/nplayers.txt |    13 +-
 nplayers/nplayers.ini      |   685 +-
 3 files changed, 39983 insertions(+), 15208 deletions(-)

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