ShuriZma
/
mame
mirror of https://github.com/mamedev/mame.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
74,518 Commits 44 Branches 311 Tags 2.1 GiB
Commit Graph

15 Commits

Author SHA1 Message Date
Stiletto 88909dc0d0
Happy New Year 2020 (nw) (#6128) 
Happy New Year 2020 (nw) (#6128)
 2020-01-04 01:13:50 -05:00
Vas Crabb 97b6717027 (nw) Clean up the mess on master 
This effectively reverts b380514764 and
c24473ddff, restoring the state at
598cd52272.

Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline.  When things like this happen, it wastes
everyone's time.  I really don't need this in a week when real work™ is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
 2019-03-26 11:13:37 +11:00
andreasnaive b380514764 Revert "conflict resolution (nw)" 
This reverts commit c24473ddff, reversing
changes made to 009cba4fb8.
 2019-03-25 23:13:40 +01:00
Stiletto a5461d9d6b
2018 -> 2019 changes (nw) 
* 2018 -> 2019 changes (nw)
 2019-01-10 17:01:26 -05:00
Jonathan Holt c25b98226d Updates "2017" strings to "2018" where relevant. 2018-01-06 00:48:05 +11:00
Stiletto ded50220ad
(nw) more minor typo fixes for docs.mamedev.org 2017-12-14 00:57:18 -05:00
Firehawke 9ece34eb21 Revert "Revert "Merge branch 'master' of https://github.com/mamedev/mame"" 
This reverts commit 54155441e9.
 2017-12-13 21:31:27 -07:00
Firehawke 54155441e9 Revert "Merge branch 'master' of https://github.com/mamedev/mame" 
This reverts commit f537428e5a, reversing
changes made to 0d70d79810.
 2017-12-13 21:01:10 -07:00
Stiletto 34ab1202e7
Update whatis.rst 
(nw) self-service
 2017-12-13 14:26:34 -05:00
hap 2069183658 doc: update MAME short description (nw) 2017-11-05 18:12:28 +01:00
hap adb7ce7b2e put original abbreviation meaning as trivia here (nw) 2017-11-05 02:01:20 +01:00
hap 7d7c2c5507 make emulator description generic (nw) 2017-11-05 01:50:16 +01:00
Stiletto 9db7b63e9a Updates "2016" strings to "2017 where relevant. 
Updates "2016" strings to "2017 where relevant.
 2017-01-24 17:29:49 -05:00
Vas Crabb 66f1cb5f3a srcclean again (nw) 2016-11-30 07:04:04 +11:00
Miodrag Milanovic cb30b9d307 Added documentation to main tree (nw) 2016-08-24 15:16:43 +02:00