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
..
acinclude	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
android-project	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
build-scripts	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
cmake	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
debian	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
include	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
src	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
test	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
VisualC	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
VisualC-WinRT	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
Xcode	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
Xcode-iOS	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
Android.mk	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
autogen.sh	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
cmake_uninstall.cmake.in	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
CMakeLists.txt	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
configure	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
configure.in	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
CREDITS.txt	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
INSTALL.txt	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
Makefile.in	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
Makefile.minimal	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
Makefile.pandora	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
Makefile.psp	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
Makefile.wiz	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
sdl2-config.cmake.in	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
sdl2-config.in	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
sdl2.m4	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
sdl2.pc.in	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
SDL2.spec	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
SDL2.spec.in	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
TODO.txt	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00
VisualC.html	Placed SDL2 source since we need it on some platforms (nw)	2016-02-27 16:53:49 +01:00