Commit Graph

13 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
couriersud d208ca5105 3rdparty/lua: Fix clang 9 compile. (nw) 2019-02-23 18:54:28 +01:00
Miodrag Milanovic e6838eb5c4 LUA to 5.3.4 (nw) 2017-02-05 16:17:00 +01:00
Branimir Karadžić a3b4058bf7 Updated BGFX and BX and recompiled shaders (nw) 2016-10-29 09:11:50 +02:00
Miodrag Milanovic a6409d692e Update LUA to 5.3.3 (nw) 2016-09-03 14:34:39 +02:00
Miodrag Milanovic 3a811376d9 Made pnacl to compile (nw) 2016-02-26 14:50:09 +01:00
Miodrag Milanovic 74cfff6fc6 Update to LUA 5.2.3, so source changes (nw) 2015-12-12 14:49:48 +01:00
Miodrag Milanovic 65a7e23b2d official proposal for Android fix (nw) 2015-03-21 11:42:10 +01:00
Miodrag Milanovic fb4695be0a Made all compile for Lua 5.3 (nw) 2015-01-13 18:44:26 +01:00
Miodrag Milanovic d60dc40fe3 Update to Lua 5.3 2015-01-13 17:59:12 +01:00
Miodrag Milanovic 022e6c7a5b Fixed LUA compile 2015-01-10 15:06:17 +01:00
Miodrag Milanovic b3382b22d3 Added full Lua 5.2.3 source (nw) 2015-01-10 14:57:10 +01:00