Jean-François DEL NERO 2a5e044fc2 Merge https://github.com/mamedev/mame ... # Conflicts: # src/devices/video/ef9365.cpp		2015-12-28 11:27:47 +01:00
..
devices	Merge https://github.com/mamedev/mame	2015-12-28 11:27:47 +01:00
emu	Merge pull request #527 from ajrhacker/master	2015-12-28 07:17:17 +01:00
ldplayer
lib	chd-cd: when chdman wants only the original sectors, give it only the original sectors [R. Belmont]	2015-12-27 16:29:13 -05:00
mame	Merge pull request #512 from MASHinfo/master	2015-12-28 07:16:28 +01:00
osd	Make SDL2 use software if hardware acceleration is not available	2015-12-27 18:25:13 +01:00
tools	chdman info verbose metadata output (nw)	2015-12-26 17:49:12 +02:00
version.cpp