summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/sdl2/include/SDL2/SDL_stdinc.h
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-02-21 14:50:24 +0100
committer ImJezze <jezze@gmx.net>2016-02-21 14:50:24 +0100
commitbf4640c309c655c6cb7bc5b9bbab5c03029ccd86 (patch)
treec50f6f204d34c7a1888ab41cdf6c5250ffe7b8af /3rdparty/sdl2/include/SDL2/SDL_stdinc.h
parentcc24a339d8c0517259084b5c178d784626ba965c (diff)
parenta0ba40749d98488dafb84d365e4a6e44a4c01f84 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Resolved Conflicts: - src/osd/modules/render/d3d/d3dhlsl.cpp - src/osd/modules/render/d3d/d3dhlsl.h - src/osd/modules/render/drawd3d.cpp - src/osd/modules/render/drawd3d.h - src/osd/windows/winmain.cpp
Diffstat (limited to '3rdparty/sdl2/include/SDL2/SDL_stdinc.h')
0 files changed, 0 insertions, 0 deletions