3 Commits

Author	SHA1	Message	Date
ImJezze	6795ffe793	Fixed merge of remote-tracking branch 'refs/remotes/mamedev/master' ... - unwanted case-sensitive renaming	2016-03-03 22:37:07 +01:00
ImJezze	9fe9f6d93e	Merge remote-tracking branch 'refs/remotes/mamedev/master' ... # Resolved Conflicts: # src/osd/modules/render/d3d/d3dhlsl.cpp # src/osd/windows/winmain.cpp	2016-03-02 21:49:49 +01:00
Miodrag Milanovic	cf6dc7d370	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00