Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-10 08:12:13 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
64,969 Commits 14 Branches 270 Tags 1.7 GiB
9a0cbbec6b
Commit Graph

49 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
Vas Crabb
40fc33967c version bump (nw) 2019-02-27 00:40:05 +11:00
Vas Crabb
cf02fe333a version bump (nw) 2019-01-30 04:07:32 +11:00
Firehawke
9e3e966dea Major formatting update for command line options, copyright/version update (#4470) 
* Update copyrights and docs revision (nw)

Updates copyright on existing 2018 entries to 2019 (and one 2016)
Updates the docs compilation script to MAME 0.205 and 2019 copyright.

* Further formatting overhauling (nw)

Clamp to 80 column where possible; it makes it easier to track errant
line breaks, etc.
Also begin standardizing tab formatting and two spaces after period.

* Further corrections to command line materials (nw)

* More adjustments for Cuavas (nw)

Getting closer to acceptable.
 2019-01-11 01:06:52 +11:00
Vas Crabb
b691c38273 version bump (nw) 2018-12-26 01:27:31 +11:00
Miodrag Milanović
a45221458d Android compile fix (#4395) 
* Fix compile for Android, set API to 24

* Update Android Studio project to API 24

* Fixed project file to latest Android Studio

* fix build with gradle alone
 2018-12-11 19:38:27 -05:00
Vas Crabb
c6150e7542 version bump (nw) 2018-11-28 06:12:23 +11:00
Vas Crabb
b57a140101 version bump (nw) 2018-10-31 23:23:33 +11:00
Vas Crabb
856478fbda version bump (nw) 2018-09-26 14:43:31 +10:00
Vas Crabb
4dc302ed05 version bump (nw) 2018-08-29 10:35:24 +10:00
Vas Crabb
ff19cd3977 version bump (nw) 2018-07-25 05:45:05 +10:00
Vas Crabb
f2e805a153 version bump (nw) 2018-06-27 08:47:35 +10:00
Vas Crabb
c5f6a62d59 version bump (nw) 2018-05-30 02:37:58 +10:00
Vas Crabb
74293f8247 version bump (nw) 2018-04-24 23:13:22 +10:00
Vas Crabb
e8f2016076 version bump (nw) 2018-03-28 01:21:46 +11:00
Vas Crabb
e44e85b8ef version bump (nw) 2018-02-28 02:59:06 +11:00
Vas Crabb
5be2496d0c version bump (nw) 2018-01-31 05:48:02 +11:00
Jonathan Holt
c25b98226d Updates "2017" strings to "2018" where relevant. 2018-01-06 00:48:05 +11:00
Vas Crabb
bf28b347fb version bump (nw) 2017-12-27 12:45:37 +11:00
Vas Crabb
d771f54227 version bump (nw) 2017-11-29 05:24:46 +11:00
Martin Lindhe
b3c2645085 fix some typos (#2772) 2017-11-03 14:58:54 +01:00
Vas Crabb
a5db728b9c version bump (nw) 2017-10-25 11:30:18 +11:00
Vas Crabb
f57574c238 version bump (nw) 2017-09-27 11:30:10 +10:00
Vas Crabb
2beedc540f version bump (nw) 2017-08-30 10:05:26 +10:00
Miso Kim
41e044ae01 Modification for Android build (NDK r14b, build-tools 21.1.2 and gradle 2.2.1) (#2585) 2017-08-23 13:09:38 +10:00
Vas Crabb
7b45ec19f1 version bump (nw) 2017-07-26 09:15:29 +10:00
Vas Crabb
1d9648b01c version bump (nw) 2017-06-28 09:19:31 +10:00
Vas Crabb
e4c6cb15e0 version bump (nw) 2017-05-31 09:08:49 +10:00
Vas Crabb
fe01a1342c version bump (nw) 2017-04-26 09:02:36 +10:00
Vas Crabb
7768128734 version bump (nw) 2017-03-29 14:12:20 +11:00
Vas Crabb
4ee22dce05 version bump 2017-02-22 08:21:10 +11:00
Vas Crabb
22c42abfdf version bump (nw) 2017-01-25 09:44:30 +11:00
Stiletto
e994eee7eb Updates "2016" strings to "2017 where relevant. 
Updates "2016" strings to "2017 where relevant.
 2017-01-25 09:40:28 +11:00
Vas Crabb
bbeda6ad99 version bump (nw) 2016-12-27 10:09:29 +11:00
Vas Crabb
cfc8419567 Version bump 2016-11-27 09:59:14 +11:00
Miodrag Milanovic
60ae8c6a4b Update of manifest to better define required sdk, resolves #1753 (nw) 2016-11-23 13:24:50 +01:00
Vas Crabb
32b7e58d94 Version bump! 2016-10-26 10:45:58 +11:00
Vas Crabb
4d462536c7 bump android version for what it's worth 2016-09-28 18:23:39 +10:00
Vas Crabb
1ecb023c37 Version bump 2016-08-31 15:56:15 +10:00
Miodrag Milanovic
4887ce1844 Cleanups and version bump 2016-07-27 09:26:22 +02:00
Miodrag Milanovic
63f9a01f8c Cleanup and version bump 2016-06-29 08:34:30 +02:00
Miodrag Milanovic
68785dccfe Cleanups and version bump 2016-05-25 08:19:21 +02:00
Miodrag Milanovic
38568d0a58 update to latest build tools for Android (nw) 2016-05-17 16:09:08 +02:00
Miodrag Milanovic
e87b25b32b Update android version code and name (nw) 2016-04-28 11:38:12 +02:00
Miodrag Milanovic
c95d9c0ec3 new Android icon images [JacKc] 2016-03-30 19:54:53 +02:00
Miodrag Milanovic
f9f360927f Added license and cleanup for android-project (nw) 2016-03-29 08:37:04 +02:00
Miodrag Milanovic
c3370a3b1c version typo (nw) 2016-03-27 18:00:02 +02:00
Miodrag Milanovic
158c90cf11 Initial work to make MAME work on Android [Miodrag Milanovic] 2016-03-27 17:35:23 +02:00