angelosa 358271ab3f Merge branch 'master' into c148_rewrite ... # Conflicts: # hash/ibm5150.xml # src/mame/drivers/gsword.cpp # src/mame/drivers/rm380z.cpp # src/mame/drivers/rohga.cpp		2017-01-02 04:15:37 +01:00
..
build	coretmpl: add an associative LRU cache with map-like behaviour	2016-12-15 17:00:34 +11:00
font	coretmpl: add an associative LRU cache with map-like behaviour	2016-12-15 17:00:34 +11:00
resources	UWP: Add temporary signing key for MSBUILD support (nw)	2016-12-13 13:47:19 -05:00
src	Heh missed these too	2016-12-31 20:07:30 -05:00
target	Merge branch 'master' into c148_rewrite	2017-01-02 04:15:37 +01:00
extlib.lua	resurected sqlite3 and lsqlite3 (nw)	2016-11-07 16:12:06 +01:00
genie.lua	detect if SOURCES file do not exist (nw)	2016-12-09 13:00:51 +01:00
toolchain.lua	Added VS2017 support into project files (nw)	2016-11-16 21:00:29 +01:00