8 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	6669489679	allow repeating elements and groups - useful if you need e.g. a lot of numbered labels, but it limits complay.py's ability to check for invalid references as it can't evaluate expressions (nw)	2018-07-22 09:52:50 +10:00
Stiletto	e51076bd41	(nw) ... (nw)	2018-02-07 16:40:50 -05:00
Stiletto	ec5d60720f	Minor updates (nw) ... Minor updates (nw)	2018-02-07 16:38:41 -05:00
Dan Amador	3a43ec44cc	Update luaengine.rst	2017-05-22 18:08:28 -05:00
Miodrag Milanovic	cb30b9d307	Added documentation to main tree (nw)	2016-08-24 15:16:43 +02:00