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

53 Commits

Author SHA1 Message Date
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
Vas Crabb ccfcb431d0 cherry-pick fixes from mainline and clean up some stuff (nw) 2018-07-23 12:29:25 +10:00
Stiletto f0ea9963e3
add AppVeyor badge back to the readme. 
add AppVeyor badge back to the readme.
 2018-07-07 15:09:01 -04:00
Jonathan Holt c25b98226d Updates "2017" strings to "2018" where relevant. 2018-01-06 00:48:05 +11:00
Stiletto 1f328be2e7
(nw) 2017-12-21 07:52:21 -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 6894eed1e0 he's just this guy, you know *nw* 2017-08-25 11:35:13 -04:00
Stiletto 7a6d1e768d Add coverity scan badge (nw) 
Add coverity scan badge (nw)
 2017-03-22 12:50:21 -04: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 bc205d3a14 We tend to use Allman, not GNU (nw) 2016-07-07 22:55:08 +10:00
Vas Crabb a5bd5a08c8 Link to doc site (nw) 2016-06-11 23:05:54 +10:00
Miodrag Milanović bded10179b Update README.md 2016-05-29 10:19:05 +02:00
Miodrag Milanović 9e6f6624fc Update README.md 2016-03-26 15:57:42 +01:00
Miodrag Milanović 3e12728afa Update README.md 2016-03-26 15:56:48 +01:00
balr0g 42291f0367 minor README adjustments (nw) 2016-03-04 10:37:52 -05:00
Miodrag Milanovic 1b7317f004 typos, thanks Logan (nw) 2016-03-04 13:30:03 +01:00
Vas Crabb f6d0dc13ee More doc updates/clarifications 2016-03-04 22:15:05 +11:00
Vas Crabb 55c7167b34 More adjustment 2016-03-04 21:54:14 +11:00
Vas Crabb 388f50043d details 2016-03-04 21:22:34 +11:00
Vas Crabb 865ee8b1ee Clean up 2016-03-04 21:16:39 +11:00
Miodrag Milanovic 5cef4e1f91 Added LICENSE file and updated README.md (nw) 2016-03-04 11:00:21 +01:00
Miodrag Milanović 106b674acb Update README.md 2015-09-28 10:47:56 +02:00
Dirk Best 58fc8a3180 add appveyor badge to the readme 2015-07-14 15:34:54 +02:00
Dirk Best 5d80e27c48 add travis status 2015-07-10 16:49:50 +02:00
Lord-Nightmare 84c2694454 another readme tweak (nw) 2015-05-26 15:45:53 -04:00
balr0g a8da7f2c45 minor README changes (nw) 2015-05-26 15:42:04 -04:00
balr0g 67347dc828 More minor changes (nw) 2015-05-25 15:37:57 -04:00
Miodrag Milanović 1928946dbb Update README.md 
Fixed link
 2015-05-25 16:06:19 +02:00
balr0g 5a530d78ac Further clarifications (nw) 2015-05-25 09:51:39 -04:00
balr0g 3ba2e1fd22 fix formatting (nw) 2015-05-25 09:50:19 -04:00
balr0g 7006c39be4 Properly, legally handle license stuff as we are still contacting people (nw) 2015-05-25 09:47:10 -04:00
Miodrag Milanović f770eb03cf Update README.md 
Fixed formating
 2015-05-25 14:35:36 +02:00
Miodrag Milanovic 24461e1355 Update license information on github (nw) 2015-05-25 14:33:52 +02:00
balr0g 59cb206dcc Update README for new SUBTARGET syntax (nw) 2015-05-19 15:14:31 -04:00
balr0g 71bac92863 Minor changes for clarity (nw) 2015-05-18 10:46:14 -04:00
Olivier Galibert 4257a83cb7 Be liberal in what you accept (nw) 2015-05-18 09:48:29 +02:00
Vas Crabb a15dfc6314 Brief coding standard 2015-05-18 09:34:36 +10:00
Miodrag Milanović 2526606c8b Update README.md 
removed duplicate
 2015-05-14 16:14:52 +02:00
Miodrag Milanović 6406a213c7 Merge pull request #181 from gitter-badger/gitter-badge 
Add a Gitter chat badge to README.md
 2015-05-14 16:14:06 +02:00
Miodrag Milanović be64e3015a Update README.md 
Added gitter link
 2015-05-14 16:09:14 +02:00
The Gitter Badger e9e6b22ece Added Gitter badge 2015-05-14 14:04:58 +00:00
Justin Kerk da5edaf680 grumble (nw) 2014-11-30 12:49:07 -08:00
Justin Kerk 8e8f3a6564 Add more info to the GitHub readme to prevent confusion. [Justin Kerk] 2014-11-30 12:45:31 -08:00
Robert bdf439a541 punctuation 2014-11-18 13:56:11 +11:00
Miodrag Milanović d84a72d79a Update README.md 
One more test adašđšđčćžđščđš
 2014-11-09 10:32:44 +01:00
Miodrag Milanović b96867bcd2 Update README.md 
Just test of UTF-8 encoding in notifier  
šđšđćžćžćčćč
 2014-11-09 10:26:51 +01:00