12 Commits

Author	SHA1	Message	Date
Vas Crabb	73cd2b55b8	Docmumentation update/expansion. [Firehawke, Vas Crabb]	2021-05-07 03:41:10 +10:00
Stiletto	3153838929	Update "2020" text to "2021" (#7713) ... Update "2020" text to "2021".	2021-01-28 00:11:17 -05:00
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
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	edb558b916	(nw) more self-service	2017-12-13 15:11:37 -05: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
Miodrag Milanovic	cb30b9d307	Added documentation to main tree (nw)	2016-08-24 15:16:43 +02:00