summaryrefslogtreecommitdiffstatshomepage
path: root/docs/source/whatis.rst
Commit message (Collapse)AuthorAgeFilesLines
* (nw) Clean up the mess on master Vas Crabb2019-03-261-1/+1
| | | | | | | | | | | | | This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at 598cd5227223c3b04ca31f0dbc1981256d9ea3ff. 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.
* Revert "conflict resolution (nw)" andreasnaive2019-03-251-1/+1
| | | | | This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
* 2018 -> 2019 changes (nw) Stiletto2019-01-101-1/+1
| | | * 2018 -> 2019 changes (nw)
* Updates "2017" strings to "2018" where relevant. Jonathan Holt2018-01-061-1/+1
|
* (nw) more minor typo fixes for docs.mamedev.org Stiletto2017-12-141-4/+4
|
* Revert "Revert "Merge branch 'master' of https://github.com/mamedev/mame"" Firehawke2017-12-131-1/+1
| | | | This reverts commit 54155441e9ba9941e85d80c4834a66376a11e791.
* Revert "Merge branch 'master' of https://github.com/mamedev/mame" Firehawke2017-12-131-1/+1
| | | | | This reverts commit f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4, reversing changes made to 0d70d798107d4e4e8fb9f230410aeb1e888d65c5.
* Update whatis.rst Stiletto2017-12-131-1/+1
| | | (nw) self-service
* doc: update MAME short description (nw) hap2017-11-051-1/+1
|
* put original abbreviation meaning as trivia here (nw) hap2017-11-051-1/+1
|
* make emulator description generic (nw) hap2017-11-051-2/+2
|
* Updates "2016" strings to "2017 where relevant. Stiletto2017-01-241-1/+1
| | | Updates "2016" strings to "2017 where relevant.
* srcclean again (nw) Vas Crabb2016-11-301-1/+1
|
* Added documentation to main tree (nw) Miodrag Milanovic2016-08-241-0/+70