update to latest SDL

rogererens · Oct 14, 2012 · 86327f2 · 86327f2
1 parent e76b539
commit 86327f2
Show file tree

Hide file tree

Showing 685 changed files with 28,502 additions and 28,193 deletions.
diff --git a/src/SDL/.hg/cache/branchheads b/src/SDL/.hg/cache/branchheads
@@ -1,14 +1,14 @@
-f4e14c811fd52e34ee70aaebdd812965c17cb192 6309
+404571a5752382f75a0b0a170bacc88dfc948233 6593
 2bf2dee62ea78891c2d412d7bbabfd6c37782216 SDL-ryan-multiple-audio-device
 f2d8e0b59ccac6688e7a5c89399f7c842507968e default
-f4e14c811fd52e34ee70aaebdd812965c17cb192 default
+404571a5752382f75a0b0a170bacc88dfc948233 default
 119b676a2600d56045c30dd8123e66ad102649f9 gsoc2008_force_feedback
 21196203ffa418741817dbea53ad8913edd68784 gsoc2009_IME
 6f025b97c55c675b335c708414de782ee7347fec gsoc2008_iphone
 ab53c78e0f3bb72ddeacb70e2183153e18bbb8c0 gsoc2009_ps3
 2e253188dcd2148f595b30a52abdf53e56e3aa39 SDL-1.2-olpc
 e2188009f029855da921a041bbcf95303ca509cc gsoc2008_nds
-2b923729fd01d34b3913bd4ac8458c7121825f78 SDL-1.2
+bc23c3b164fa0ea601555de0e224a952f70c06ef SDL-1.2
 06be4b33029d9e4012380084dd37dc1730062921 SDL-1.3
 c5616d36b2ac4723906170b4608a0ad49f1f98d9 gsoc2009_unit_tests
 14a08e45a4d36b93c8db8f850f483316c2f3ae25 gsoc2008_audio_resampling

diff --git a/src/SDL/.hg/cache/tags b/src/SDL/.hg/cache/tags
@@ -1,5 +1,5 @@
-6309 f4e14c811fd52e34ee70aaebdd812965c17cb192 a1616a61e966c1b1136d6ca57a0e7165441d603a
-6308 2b923729fd01d34b3913bd4ac8458c7121825f78 bb426bf40cac1882c852d81a696d72abf05ee755
+6593 404571a5752382f75a0b0a170bacc88dfc948233 a1616a61e966c1b1136d6ca57a0e7165441d603a
+6588 bc23c3b164fa0ea601555de0e224a952f70c06ef bb426bf40cac1882c852d81a696d72abf05ee755
 5551 b95bb58b703af987349d3603a7d008e11a061d7a a1616a61e966c1b1136d6ca57a0e7165441d603a
 5079 f2d8e0b59ccac6688e7a5c89399f7c842507968e a1616a61e966c1b1136d6ca57a0e7165441d603a
 4416 06be4b33029d9e4012380084dd37dc1730062921

diff --git a/src/SDL/.hg/dirstate b/src/SDL/.hg/dirstate
diff --git a/src/SDL/.hg/last-message.txt b/src/SDL/.hg/last-message.txt
@@ -1 +1 @@
-update SDL from original repo
+update with latest SDL repo
diff --git a/src/SDL/.hg/store/00changelog.d b/src/SDL/.hg/store/00changelog.d
diff --git a/src/SDL/.hg/store/00changelog.i b/src/SDL/.hg/store/00changelog.i
diff --git a/src/SDL/.hg/store/00manifest.d b/src/SDL/.hg/store/00manifest.d
diff --git a/src/SDL/.hg/store/00manifest.i b/src/SDL/.hg/store/00manifest.i
diff --git a/src/SDL/.hg/store/data/_android.mk.i b/src/SDL/.hg/store/data/_android.mk.i
diff --git a/src/SDL/.hg/store/data/_makefile.in.i b/src/SDL/.hg/store/data/_makefile.in.i
diff --git a/src/SDL/.hg/store/data/_r_e_a_d_m_e._win_c_e.i b/src/SDL/.hg/store/data/_r_e_a_d_m_e._win_c_e.i
diff --git a/src/SDL/.hg/store/data/_r_e_a_d_m_e.android.i b/src/SDL/.hg/store/data/_r_e_a_d_m_e.android.i
diff --git a/src/SDL/.hg/store/data/_r_e_a_d_m_e.i_o_s.i b/src/SDL/.hg/store/data/_r_e_a_d_m_e.i_o_s.i
diff --git a/src/SDL/.hg/store/data/_t_o_d_o.i b/src/SDL/.hg/store/data/_t_o_d_o.i
diff --git a/src/SDL/.hg/store/data/_visual_c/_s_d_l/_s_d_l___v_s2008.vcproj.i b/src/SDL/.hg/store/data/_visual_c/_s_d_l/_s_d_l___v_s2008.vcproj.i
diff --git a/src/SDL/.hg/store/data/_visual_c/_s_d_l/_s_d_l___v_s2010.vcxproj.i b/src/SDL/.hg/store/data/_visual_c/_s_d_l/_s_d_l___v_s2010.vcxproj.i
diff --git a/src/SDL/.hg/store/data/_visual_c/_s_d_l___v_s2008.sln.i b/src/SDL/.hg/store/data/_visual_c/_s_d_l___v_s2008.sln.i
diff --git a/src/SDL/.hg/store/data/_visual_c/_s_d_l___v_s2010.sln.i b/src/SDL/.hg/store/data/_visual_c/_s_d_l___v_s2010.sln.i
diff --git a/src/SDL/.hg/store/data/_xcode-i_o_s/_demos/_demos.xcodeproj/project.pbxproj.i b/src/SDL/.hg/store/data/_xcode-i_o_s/_demos/_demos.xcodeproj/project.pbxproj.i
diff --git a/src/SDL/.hg/store/data/_xcode-i_o_s/_demos/src/keyboard.c.i b/src/SDL/.hg/store/data/_xcode-i_o_s/_demos/src/keyboard.c.i
diff --git a/src/SDL/.hg/store/data/_xcode-i_o_s/_s_d_l/_s_d_l.xcodeproj/project.pbxproj.i b/src/SDL/.hg/store/data/_xcode-i_o_s/_s_d_l/_s_d_l.xcodeproj/project.pbxproj.i
diff --git a/src/SDL/.hg/store/data/_xcode-i_o_s/_test/_testi_phone_o_s.xcodeproj/project.pbxproj.i b/src/SDL/.hg/store/data/_xcode-i_o_s/_test/_testi_phone_o_s.xcodeproj/project.pbxproj.i
diff --git a/src/SDL/.hg/store/data/_xcode/_s_d_l/_s_d_l.xcodeproj/project.pbxproj.d b/src/SDL/.hg/store/data/_xcode/_s_d_l/_s_d_l.xcodeproj/project.pbxproj.d
diff --git a/src/SDL/.hg/store/data/_xcode/_s_d_l/_s_d_l.xcodeproj/project.pbxproj.i b/src/SDL/.hg/store/data/_xcode/_s_d_l/_s_d_l.xcodeproj/project.pbxproj.i
diff --git a/src/SDL/.hg/store/data/acinclude/ac__check__define.m4.i b/src/SDL/.hg/store/data/acinclude/ac__check__define.m4.i
diff --git a/src/SDL/.hg/store/data/acinclude/libtool.m4.d b/src/SDL/.hg/store/data/acinclude/libtool.m4.d
diff --git a/src/SDL/.hg/store/data/acinclude/libtool.m4.i b/src/SDL/.hg/store/data/acinclude/libtool.m4.i
diff --git a/src/SDL/.hg/store/data/acinclude/ltoptions.m4.i b/src/SDL/.hg/store/data/acinclude/ltoptions.m4.i
diff --git a/src/SDL/.hg/store/data/acinclude/ltsugar.m4.i b/src/SDL/.hg/store/data/acinclude/ltsugar.m4.i
diff --git a/src/SDL/.hg/store/data/acinclude/ltversion.m4.i b/src/SDL/.hg/store/data/acinclude/ltversion.m4.i
diff --git a/src/SDL/.hg/store/data/acinclude/lt~7eobsolete.m4.i b/src/SDL/.hg/store/data/acinclude/lt~7eobsolete.m4.i
diff --git a/src/SDL/.hg/store/data/aclocal.m4.i b/src/SDL/.hg/store/data/aclocal.m4.i
diff --git a/src/SDL/.hg/store/data/android-project/_android_manifest.xml.i b/src/SDL/.hg/store/data/android-project/_android_manifest.xml.i
diff --git a/src/SDL/.hg/store/data/android-project/src/org/libsdl/app/_s_d_l_activity.java.i b/src/SDL/.hg/store/data/android-project/src/org/libsdl/app/_s_d_l_activity.java.i
diff --git a/src/SDL/.hg/store/data/build-scripts/config.guess.i b/src/SDL/.hg/store/data/build-scripts/config.guess.i
diff --git a/src/SDL/.hg/store/data/build-scripts/config.sub.i b/src/SDL/.hg/store/data/build-scripts/config.sub.i
diff --git a/src/SDL/.hg/store/data/build-scripts/fatbuild.sh.i b/src/SDL/.hg/store/data/build-scripts/fatbuild.sh.i
diff --git a/src/SDL/.hg/store/data/build-scripts/iosbuild.sh.i b/src/SDL/.hg/store/data/build-scripts/iosbuild.sh.i
diff --git a/src/SDL/.hg/store/data/build-scripts/ltmain.sh.d b/src/SDL/.hg/store/data/build-scripts/ltmain.sh.d
diff --git a/src/SDL/.hg/store/data/build-scripts/ltmain.sh.i b/src/SDL/.hg/store/data/build-scripts/ltmain.sh.i
diff --git a/src/SDL/.hg/store/data/configure.d b/src/SDL/.hg/store/data/configure.d
diff --git a/src/SDL/.hg/store/data/configure.i b/src/SDL/.hg/store/data/configure.i
diff --git a/src/SDL/.hg/store/data/configure.in.d b/src/SDL/.hg/store/data/configure.in.d
diff --git a/src/SDL/.hg/store/data/configure.in.i b/src/SDL/.hg/store/data/configure.in.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l.h.i b/src/SDL/.hg/store/data/include/_s_d_l.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__assert.h.i b/src/SDL/.hg/store/data/include/_s_d_l__assert.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__atomic.h.i b/src/SDL/.hg/store/data/include/_s_d_l__atomic.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__config.h.in.i b/src/SDL/.hg/store/data/include/_s_d_l__config.h.in.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__config__android.h.i b/src/SDL/.hg/store/data/include/_s_d_l__config__android.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__config__macosx.h.i b/src/SDL/.hg/store/data/include/_s_d_l__config__macosx.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__config__pandora.h.i b/src/SDL/.hg/store/data/include/_s_d_l__config__pandora.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__config__windows.h.i b/src/SDL/.hg/store/data/include/_s_d_l__config__windows.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__cpuinfo.h.i b/src/SDL/.hg/store/data/include/_s_d_l__cpuinfo.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__hints.h.i b/src/SDL/.hg/store/data/include/_s_d_l__hints.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__keyboard.h.i b/src/SDL/.hg/store/data/include/_s_d_l__keyboard.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__opengl.h.d b/src/SDL/.hg/store/data/include/_s_d_l__opengl.h.d
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__opengl.h.i b/src/SDL/.hg/store/data/include/_s_d_l__opengl.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__render.h.i b/src/SDL/.hg/store/data/include/_s_d_l__render.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__rwops.h.i b/src/SDL/.hg/store/data/include/_s_d_l__rwops.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__system.h.i b/src/SDL/.hg/store/data/include/_s_d_l__system.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__thread.h.i b/src/SDL/.hg/store/data/include/_s_d_l__thread.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__touch.h.i b/src/SDL/.hg/store/data/include/_s_d_l__touch.h.i
diff --git a/src/SDL/.hg/store/data/include/_s_d_l__video.h.i b/src/SDL/.hg/store/data/include/_s_d_l__video.h.i
diff --git a/src/SDL/.hg/store/data/src/_s_d_l.c.i b/src/SDL/.hg/store/data/src/_s_d_l.c.i
diff --git a/src/SDL/.hg/store/data/src/_s_d_l__hints.c.i b/src/SDL/.hg/store/data/src/_s_d_l__hints.c.i
diff --git a/src/SDL/.hg/store/data/src/audio/_s_d_l__audio.c.i b/src/SDL/.hg/store/data/src/audio/_s_d_l__audio.c.i
diff --git a/src/SDL/.hg/store/data/src/audio/_s_d_l__sysaudio.h.i b/src/SDL/.hg/store/data/src/audio/_s_d_l__sysaudio.h.i
diff --git a/src/SDL/.hg/store/data/src/audio/_s_d_l__wave.c.i b/src/SDL/.hg/store/data/src/audio/_s_d_l__wave.c.i
diff --git a/src/SDL/.hg/store/data/src/audio/baudio/_s_d_l__beaudio.cc.i b/src/SDL/.hg/store/data/src/audio/baudio/_s_d_l__beaudio.cc.i
diff --git a/src/SDL/.hg/store/data/src/audio/coreaudio/_s_d_l__coreaudio.c.i b/src/SDL/.hg/store/data/src/audio/coreaudio/_s_d_l__coreaudio.c.i
diff --git a/src/SDL/.hg/store/data/src/audio/qsa/_s_d_l__qsa__audio.c.i b/src/SDL/.hg/store/data/src/audio/qsa/_s_d_l__qsa__audio.c.i
diff --git a/src/SDL/.hg/store/data/src/audio/sndio/_s_d_l__sndioaudio.c.i b/src/SDL/.hg/store/data/src/audio/sndio/_s_d_l__sndioaudio.c.i
diff --git a/src/SDL/.hg/store/data/src/audio/sndio/_s_d_l__sndioaudio.h.i b/src/SDL/.hg/store/data/src/audio/sndio/_s_d_l__sndioaudio.h.i
diff --git a/src/SDL/.hg/store/data/src/audio/sun/_s_d_l__sunaudio.c.i b/src/SDL/.hg/store/data/src/audio/sun/_s_d_l__sunaudio.c.i
diff --git a/src/SDL/.hg/store/data/src/audio/winmm/_s_d_l__winmm.c.i b/src/SDL/.hg/store/data/src/audio/winmm/_s_d_l__winmm.c.i
diff --git a/src/SDL/.hg/store/data/src/audio/xaudio2/_s_d_l__xaudio2.c.i b/src/SDL/.hg/store/data/src/audio/xaudio2/_s_d_l__xaudio2.c.i
diff --git a/src/SDL/.hg/store/data/src/cdrom/freebsd/_s_d_l__syscdrom.c.i b/src/SDL/.hg/store/data/src/cdrom/freebsd/_s_d_l__syscdrom.c.i
diff --git a/src/SDL/.hg/store/data/src/core/android/_s_d_l__android.cpp.i b/src/SDL/.hg/store/data/src/core/android/_s_d_l__android.cpp.i
diff --git a/src/SDL/.hg/store/data/src/core/android/_s_d_l__android.h.i b/src/SDL/.hg/store/data/src/core/android/_s_d_l__android.h.i
diff --git a/src/SDL/.hg/store/data/src/core/windows/_s_d_l__windows.h.i b/src/SDL/.hg/store/data/src/core/windows/_s_d_l__windows.h.i
diff --git a/src/SDL/.hg/store/data/src/cpuinfo/_s_d_l__cpuinfo.c.i b/src/SDL/.hg/store/data/src/cpuinfo/_s_d_l__cpuinfo.c.i
diff --git a/src/SDL/.hg/store/data/src/events/_s_d_l__events.c.i b/src/SDL/.hg/store/data/src/events/_s_d_l__events.c.i
diff --git a/src/SDL/.hg/store/data/src/events/_s_d_l__windowevents.c.i b/src/SDL/.hg/store/data/src/events/_s_d_l__windowevents.c.i
diff --git a/src/SDL/.hg/store/data/src/file/_s_d_l__rwops.c.i b/src/SDL/.hg/store/data/src/file/_s_d_l__rwops.c.i
diff --git a/src/SDL/.hg/store/data/src/haptic/_s_d_l__haptic.c.i b/src/SDL/.hg/store/data/src/haptic/_s_d_l__haptic.c.i
diff --git a/src/SDL/.hg/store/data/src/haptic/windows/_s_d_l__syshaptic.c.i b/src/SDL/.hg/store/data/src/haptic/windows/_s_d_l__syshaptic.c.i
diff --git a/src/SDL/.hg/store/data/src/joystick/bsd/_s_d_l__sysjoystick.c.i b/src/SDL/.hg/store/data/src/joystick/bsd/_s_d_l__sysjoystick.c.i
diff --git a/src/SDL/.hg/store/data/src/joystick/linux/_s_d_l__sysjoystick.c.d b/src/SDL/.hg/store/data/src/joystick/linux/_s_d_l__sysjoystick.c.d
diff --git a/src/SDL/.hg/store/data/src/joystick/linux/_s_d_l__sysjoystick.c.i b/src/SDL/.hg/store/data/src/joystick/linux/_s_d_l__sysjoystick.c.i
diff --git a/src/SDL/.hg/store/data/src/joystick/windows/_s_d_l__dxjoystick.c.i b/src/SDL/.hg/store/data/src/joystick/windows/_s_d_l__dxjoystick.c.i
diff --git a/src/SDL/.hg/store/data/src/loadso/windows/_s_d_l__sysloadso.c.i b/src/SDL/.hg/store/data/src/loadso/windows/_s_d_l__sysloadso.c.i
diff --git a/src/SDL/.hg/store/data/src/main/android/_s_d_l__android__main.cpp.i b/src/SDL/.hg/store/data/src/main/android/_s_d_l__android__main.cpp.i
diff --git a/src/SDL/.hg/store/data/src/main/windows/_s_d_l__windows__main.c.i b/src/SDL/.hg/store/data/src/main/windows/_s_d_l__windows__main.c.i
diff --git a/src/SDL/.hg/store/data/src/power/_s_d_l__power.c.i b/src/SDL/.hg/store/data/src/power/_s_d_l__power.c.i
diff --git a/src/SDL/.hg/store/data/src/power/android/_s_d_l__syspower.c.i b/src/SDL/.hg/store/data/src/power/android/_s_d_l__syspower.c.i
diff --git a/src/SDL/.hg/store/data/src/power/windows/_s_d_l__syspower.c.i b/src/SDL/.hg/store/data/src/power/windows/_s_d_l__syspower.c.i
diff --git a/src/SDL/.hg/store/data/src/render/_s_d_l__render.c.i b/src/SDL/.hg/store/data/src/render/_s_d_l__render.c.i
diff --git a/src/SDL/.hg/store/data/src/render/_s_d_l__sysrender.h.i b/src/SDL/.hg/store/data/src/render/_s_d_l__sysrender.h.i
diff --git a/src/SDL/.hg/store/data/src/render/_s_d_l__yuv__sw.c.i b/src/SDL/.hg/store/data/src/render/_s_d_l__yuv__sw.c.i
diff --git a/src/SDL/.hg/store/data/src/render/direct3d/_s_d_l__render__d3d.c.i b/src/SDL/.hg/store/data/src/render/direct3d/_s_d_l__render__d3d.c.i
diff --git a/src/SDL/.hg/store/data/src/render/opengl/_s_d_l__glfuncs.h.i b/src/SDL/.hg/store/data/src/render/opengl/_s_d_l__glfuncs.h.i
diff --git a/src/SDL/.hg/store/data/src/render/opengl/_s_d_l__render__gl.c.i b/src/SDL/.hg/store/data/src/render/opengl/_s_d_l__render__gl.c.i
diff --git a/src/SDL/.hg/store/data/src/render/opengles/_s_d_l__glesfuncs.h.i b/src/SDL/.hg/store/data/src/render/opengles/_s_d_l__glesfuncs.h.i
diff --git a/src/SDL/.hg/store/data/src/render/opengles/_s_d_l__render__gles.c.i b/src/SDL/.hg/store/data/src/render/opengles/_s_d_l__render__gles.c.i
diff --git a/src/SDL/.hg/store/data/src/render/opengles2/_s_d_l__render__gles2.c.i b/src/SDL/.hg/store/data/src/render/opengles2/_s_d_l__render__gles2.c.i
diff --git a/src/SDL/.hg/store/data/src/render/opengles2/_s_d_l__shaders__gles2.c.i b/src/SDL/.hg/store/data/src/render/opengles2/_s_d_l__shaders__gles2.c.i
diff --git a/src/SDL/.hg/store/data/src/render/software/_s_d_l__render__sw.c.i b/src/SDL/.hg/store/data/src/render/software/_s_d_l__render__sw.c.i
diff --git a/src/SDL/.hg/store/data/src/render/software/_s_d_l__rotate.c.i b/src/SDL/.hg/store/data/src/render/software/_s_d_l__rotate.c.i
diff --git a/src/SDL/.hg/store/data/src/render/software/_s_d_l__rotate.h.i b/src/SDL/.hg/store/data/src/render/software/_s_d_l__rotate.h.i
diff --git a/src/SDL/.hg/store/data/src/stdlib/_s_d_l__getenv.c.i b/src/SDL/.hg/store/data/src/stdlib/_s_d_l__getenv.c.i
diff --git a/src/SDL/.hg/store/data/src/stdlib/_s_d_l__stdlib.c.i b/src/SDL/.hg/store/data/src/stdlib/_s_d_l__stdlib.c.i
diff --git a/src/SDL/.hg/store/data/src/thread/pthread/_s_d_l__systhread.c.i b/src/SDL/.hg/store/data/src/thread/pthread/_s_d_l__systhread.c.i
diff --git a/src/SDL/.hg/store/data/src/thread/windows/_s_d_l__sysmutex.c.i b/src/SDL/.hg/store/data/src/thread/windows/_s_d_l__sysmutex.c.i
diff --git a/src/SDL/.hg/store/data/src/thread/windows/_s_d_l__syssem.c.i b/src/SDL/.hg/store/data/src/thread/windows/_s_d_l__syssem.c.i
diff --git a/src/SDL/.hg/store/data/src/thread/windows/_s_d_l__systhread.c.i b/src/SDL/.hg/store/data/src/thread/windows/_s_d_l__systhread.c.i
diff --git a/src/SDL/.hg/store/data/src/timer/_s_d_l__timer.c.i b/src/SDL/.hg/store/data/src/timer/_s_d_l__timer.c.i
diff --git a/src/SDL/.hg/store/data/src/timer/windows/_s_d_l__systimer.c.i b/src/SDL/.hg/store/data/src/timer/windows/_s_d_l__systimer.c.i
diff --git a/src/SDL/.hg/store/data/src/video/_s_d_l___r_l_eaccel.c.i b/src/SDL/.hg/store/data/src/video/_s_d_l___r_l_eaccel.c.i
diff --git a/src/SDL/.hg/store/data/src/video/_s_d_l__blit___n.c.d b/src/SDL/.hg/store/data/src/video/_s_d_l__blit___n.c.d
diff --git a/src/SDL/.hg/store/data/src/video/_s_d_l__blit___n.c.i b/src/SDL/.hg/store/data/src/video/_s_d_l__blit___n.c.i
diff --git a/src/SDL/.hg/store/data/src/video/_s_d_l__bmp.c.i b/src/SDL/.hg/store/data/src/video/_s_d_l__bmp.c.i
diff --git a/src/SDL/.hg/store/data/src/video/_s_d_l__stretch.c.i b/src/SDL/.hg/store/data/src/video/_s_d_l__stretch.c.i
diff --git a/src/SDL/.hg/store/data/src/video/_s_d_l__surface.c.i b/src/SDL/.hg/store/data/src/video/_s_d_l__surface.c.i
diff --git a/src/SDL/.hg/store/data/src/video/_s_d_l__sysvideo.h.i b/src/SDL/.hg/store/data/src/video/_s_d_l__sysvideo.h.i
diff --git a/src/SDL/.hg/store/data/src/video/_s_d_l__video.c.d b/src/SDL/.hg/store/data/src/video/_s_d_l__video.c.d
diff --git a/src/SDL/.hg/store/data/src/video/_s_d_l__video.c.i b/src/SDL/.hg/store/data/src/video/_s_d_l__video.c.i
diff --git a/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidclipboard.c.i b/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidclipboard.c.i
diff --git a/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidclipboard.h.i b/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidclipboard.h.i
diff --git a/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidevents.c.i b/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidevents.c.i
diff --git a/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidkeyboard.c.i b/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidkeyboard.c.i
diff --git a/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidkeyboard.h.i b/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidkeyboard.h.i
diff --git a/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidtouch.c.i b/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidtouch.c.i
diff --git a/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidvideo.c.i b/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidvideo.c.i
diff --git a/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidvideo.h.i b/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidvideo.h.i
diff --git a/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidwindow.c.i b/src/SDL/.hg/store/data/src/video/android/_s_d_l__androidwindow.c.i
diff --git a/src/SDL/.hg/store/data/src/video/bwindow/_s_d_l___b_win.h.i b/src/SDL/.hg/store/data/src/video/bwindow/_s_d_l___b_win.h.i
diff --git a/src/SDL/.hg/store/data/src/video/bwindow/_s_d_l__bvideo.cc.i b/src/SDL/.hg/store/data/src/video/bwindow/_s_d_l__bvideo.cc.i
diff --git a/src/SDL/.hg/store/data/src/video/bwindow/_s_d_l__bwindow.cc.i b/src/SDL/.hg/store/data/src/video/bwindow/_s_d_l__bwindow.cc.i
diff --git a/src/SDL/.hg/store/data/src/video/bwindow/_s_d_l__bwindow.h.i b/src/SDL/.hg/store/data/src/video/bwindow/_s_d_l__bwindow.h.i
diff --git a/src/SDL/.hg/store/data/src/video/cocoa/_s_d_l__cocoaevents.m.i b/src/SDL/.hg/store/data/src/video/cocoa/_s_d_l__cocoaevents.m.i
diff --git a/src/SDL/.hg/store/data/src/video/cocoa/_s_d_l__cocoamodes.m.i b/src/SDL/.hg/store/data/src/video/cocoa/_s_d_l__cocoamodes.m.i
diff --git a/src/SDL/.hg/store/data/src/video/cocoa/_s_d_l__cocoaopengl.m.i b/src/SDL/.hg/store/data/src/video/cocoa/_s_d_l__cocoaopengl.m.i
diff --git a/src/SDL/.hg/store/data/src/video/cocoa/_s_d_l__cocoavideo.m.i b/src/SDL/.hg/store/data/src/video/cocoa/_s_d_l__cocoavideo.m.i
diff --git a/src/SDL/.hg/store/data/src/video/cocoa/_s_d_l__cocoawindow.h.i b/src/SDL/.hg/store/data/src/video/cocoa/_s_d_l__cocoawindow.h.i
diff --git a/src/SDL/.hg/store/data/src/video/cocoa/_s_d_l__cocoawindow.m.i b/src/SDL/.hg/store/data/src/video/cocoa/_s_d_l__cocoawindow.m.i
diff --git a/src/SDL/.hg/store/data/src/video/directfb/_s_d_l___direct_f_b__opengl.c.i b/src/SDL/.hg/store/data/src/video/directfb/_s_d_l___direct_f_b__opengl.c.i
diff --git a/src/SDL/.hg/store/data/src/video/directfb/_s_d_l___direct_f_b__video.c.i b/src/SDL/.hg/store/data/src/video/directfb/_s_d_l___direct_f_b__video.c.i
diff --git a/src/SDL/.hg/store/data/src/video/gem/_s_d_l__gemevents.c.i b/src/SDL/.hg/store/data/src/video/gem/_s_d_l__gemevents.c.i
diff --git a/src/SDL/.hg/store/data/src/video/pandora/_s_d_l__pandora.c.i b/src/SDL/.hg/store/data/src/video/pandora/_s_d_l__pandora.c.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitappdelegate.m.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitappdelegate.m.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitevents.m.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitevents.m.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitkeyboard.h.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitkeyboard.h.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitmodes.h.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitmodes.h.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitmodes.m.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitmodes.m.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitopengles.m.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitopengles.m.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitopenglview.h.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitopenglview.h.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitopenglview.m.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitopenglview.m.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitvideo.h.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitvideo.h.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitvideo.m.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitvideo.m.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitview.h.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitview.h.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitview.m.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitview.m.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitviewcontroller.h.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitviewcontroller.h.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitviewcontroller.m.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitviewcontroller.m.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitwindow.h.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitwindow.h.i
diff --git a/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitwindow.m.i b/src/SDL/.hg/store/data/src/video/uikit/_s_d_l__uikitwindow.m.i
diff --git a/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsclipboard.c.i b/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsclipboard.c.i
diff --git a/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsevents.c.i b/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsevents.c.i
diff --git a/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsframebuffer.c.i b/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsframebuffer.c.i
diff --git a/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowskeyboard.c.i b/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowskeyboard.c.i
diff --git a/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsmodes.c.i b/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsmodes.c.i
diff --git a/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsmouse.c.i b/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsmouse.c.i
diff --git a/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsopengl.c.i b/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsopengl.c.i
diff --git a/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsopengl.h.i b/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsopengl.h.i
diff --git a/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsshape.c.i b/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsshape.c.i
diff --git a/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsvideo.c.i b/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsvideo.c.i
diff --git a/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsvideo.h.i b/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowsvideo.h.i
diff --git a/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowswindow.c.i b/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowswindow.c.i
diff --git a/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowswindow.h.i b/src/SDL/.hg/store/data/src/video/windows/_s_d_l__windowswindow.h.i
diff --git a/src/SDL/.hg/store/data/src/video/wscons/_s_d_l__wsconsevents.c.i b/src/SDL/.hg/store/data/src/video/wscons/_s_d_l__wsconsevents.c.i
diff --git a/src/SDL/.hg/store/data/src/video/wscons/_s_d_l__wsconsvideo.c.i b/src/SDL/.hg/store/data/src/video/wscons/_s_d_l__wsconsvideo.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11clipboard.c.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11clipboard.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11dyn.c.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11dyn.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11dyn.h.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11dyn.h.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11events.c.d b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11events.c.d
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11events.c.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11events.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11framebuffer.c.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11framebuffer.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11keyboard.c.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11keyboard.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11modes.c.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11modes.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11modes.h.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11modes.h.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11modes__c.h.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11modes__c.h.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11mouse.c.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11mouse.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11mouse.h.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11mouse.h.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11opengl.c.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11opengl.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11opengl.h.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11opengl.h.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11opengles.c.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11opengles.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11opengles.h.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11opengles.h.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11sym.h.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11sym.h.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11touch.c.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11touch.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11touch.h.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11touch.h.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11video.c.d b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11video.c.d
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11video.c.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11video.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11video.h.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11video.h.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11window.c.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11window.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11window.h.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11window.h.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11wm.c.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11wm.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11xinput2.c.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11xinput2.c.i
diff --git a/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11xinput2.h.i b/src/SDL/.hg/store/data/src/video/x11/_s_d_l__x11xinput2.h.i
diff --git a/src/SDL/.hg/store/data/test/_makefile.in.i b/src/SDL/.hg/store/data/test/_makefile.in.i
diff --git a/src/SDL/.hg/store/data/test/automated/_makefile.i b/src/SDL/.hg/store/data/test/automated/_makefile.i
diff --git a/src/SDL/.hg/store/data/test/checkkeys.c.i b/src/SDL/.hg/store/data/test/checkkeys.c.i
diff --git a/src/SDL/.hg/store/data/test/common.c.i b/src/SDL/.hg/store/data/test/common.c.i
diff --git a/src/SDL/.hg/store/data/test/configure.d b/src/SDL/.hg/store/data/test/configure.d
diff --git a/src/SDL/.hg/store/data/test/configure.i b/src/SDL/.hg/store/data/test/configure.i
diff --git a/src/SDL/.hg/store/data/test/configure.in.i b/src/SDL/.hg/store/data/test/configure.in.i
diff --git a/src/SDL/.hg/store/data/test/test-automation/acinclude/libtool.m4.i b/src/SDL/.hg/store/data/test/test-automation/acinclude/libtool.m4.i
diff --git a/src/SDL/.hg/store/data/test/testgl2.c.i b/src/SDL/.hg/store/data/test/testgl2.c.i
diff --git a/src/SDL/.hg/store/data/test/testime.c.i b/src/SDL/.hg/store/data/test/testime.c.i
diff --git a/src/SDL/.hg/store/data/test/testjoystick.c.i b/src/SDL/.hg/store/data/test/testjoystick.c.i
diff --git a/src/SDL/.hg/store/data/test/testrelative.c.i b/src/SDL/.hg/store/data/test/testrelative.c.i
diff --git a/src/SDL/.hg/store/data/test/testrendercopyex.c.i b/src/SDL/.hg/store/data/test/testrendercopyex.c.i
diff --git a/src/SDL/.hg/store/data/~2ehgignore.i b/src/SDL/.hg/store/data/~2ehgignore.i
diff --git a/src/SDL/.hg/store/fncache b/src/SDL/.hg/store/fncache
diff --git a/src/SDL/.hg/store/undo b/src/SDL/.hg/store/undo
diff --git a/src/SDL/.hg/store/undo.phaseroots b/src/SDL/.hg/store/undo.phaseroots
@@ -0,0 +1 @@
+1 f4e14c811fd52e34ee70aaebdd812965c17cb192
diff --git a/src/SDL/.hg/undo.desc b/src/SDL/.hg/undo.desc
@@ -1,2 +1,2 @@
-6309
+6593
 commit
diff --git a/src/SDL/.hg/undo.dirstate b/src/SDL/.hg/undo.dirstate
diff --git a/src/SDL/.hgignore b/src/SDL/.hgignore
@@ -1,4 +1,5 @@
 syntax:glob
+.svn
 autom4te*
 config.cache
 config.log
@@ -60,6 +61,8 @@ test/testnative
 test/testoverlay2
 test/testplatform
 test/testpower
+test/testrelative
+test/testrendercopyex
 test/testrendertarget
 test/testresample
 test/testrumble

diff --git a/src/SDL/Android.mk b/src/SDL/Android.mk
@@ -30,6 +30,7 @@ LOCAL_SRC_FILES := \
 	$(wildcard $(LOCAL_PATH)/src/joystick/android/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/loadso/dlopen/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/power/*.c) \
+	$(wildcard $(LOCAL_PATH)/src/power/android/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/render/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/render/*/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/stdlib/*.c) \

diff --git a/src/SDL/Makefile.in b/src/SDL/Makefile.in
@@ -77,6 +77,7 @@ HDRS = \
 	SDL_shape.h \
 	SDL_stdinc.h \
 	SDL_surface.h \
+	SDL_system.h \
 	SDL_syswm.h \
 	SDL_thread.h \
 	SDL_timer.h \

diff --git a/src/SDL/README.WinCE b/src/SDL/README.WinCE
@@ -1,55 +1,9 @@
 
-Project files for embedded Visual C++ 3.0, 4.0 and 
-Visual Studio 2005 can be found in VisualCE.zip
+Windows CE is no longer supported by SDL.
 
-SDL supports GAPI and WinDib output for Windows CE.
+We have left the CE support in SDL 1.2 for those that must have it, and we
+will accept patches that support more modern Windows Mobile platforms for
+SDL 2.0.
 
-GAPI driver supports:
+--ryan.
 
-- all possible WinCE devices (Pocket PC, Smartphones, HPC)
-  with different orientations of video memory and resolutions.
-- 4, 8 and 16 bpp devices
-- special handling of 8bpp on 8bpp devices
-- VGA mode, you can even switch between VGA and GAPI in runtime
-  (between 240x320 and 480x640 for example). On VGA devices you can
-  use either GAPI or VGA.
-- Landscape mode and automatic rotation of buttons and stylus coordinates.
-  To enable landscape mode make width of video screen bigger than height.
-  For example: 
-    SDL_SetVideoMode(320,240,16,SDL_FULLSCREEN)
-- WM2005
-- SDL_ListModes
-
-NOTE:
-There are several SDL features not available in the WinCE port of SDL.
-
-- DirectX is not yet available
-- Semaphores are not available
-- Joystick support is not available
-- CD-ROM control is not available
-
-In addition, there are several features that run in "degraded" mode:
-
-Preprocessor Symbol		Effect
-===================		=================================
-
-SDL_systimer.c:
-USE_GETTICKCOUNT		Less accurate values for SDL time functions
-USE_SETTIMER			Use only a single marginally accurate timer
-
-SDL_syswm.c:
-DISABLE_ICON_SUPPORT		Can't set the runtime window icon
-
-SDL_sysmouse.c:
-USE_STATIC_CURSOR		Only the arrow cursor is available
-
-SDL_sysevents.c:
-NO_GETKEYBOARDSTATE		Can't get modifier state on keyboard focus
-
-SDL_dibevents.c:
-NO_GETKEYBOARDSTATE		Very limited keycode translation
-
-SDL_dibvideo.c:
-NO_GETDIBITS			Can't distinguish between 15 bpp and 16 bpp
-NO_CHANGEDISPLAYSETTINGS	No fullscreen support
-NO_GAMMA_SUPPORT		Gamma correction not available
diff --git a/src/SDL/README.android b/src/SDL/README.android
@@ -58,7 +58,7 @@ android-project/
 	AndroidManifest.xml	- package manifest, do not modify
 	build.properties	- empty
 	build.xml		- build description file, used by ant
-	default.properties	- holds the ABI for the application, currently android-4 which corresponds to the Android 1.6 system image
+	default.properties	- holds the ABI for the application, currently android-5 which corresponds to the Android 2.0 system image
 	local.properties	- holds the SDK path, you should change this to the path to your SDK
 	jni/			- directory holding native code
 	jni/Android.mk		- Android makefile that includes all subdirectories
@@ -73,6 +73,38 @@ android-project/
 	src/org/libsdl/app/SDLActivity.java	- the Java class handling the initialization and binding to SDL.  Be very careful changing this, as the SDL library relies on this implementation.
 
 
+================================================================================
+ Pause / Resume behaviour
+================================================================================
+
+If SDL is compiled with SDL_ANDROID_BLOCK_ON_PAUSE defined, the event loop will
+block itself when the app is paused (ie, when the user returns to the main
+Android dashboard). Blocking is better in terms of battery use, and it allows your
+app to spring back to life instantaneously after resume (versus polling for
+a resume message).
+Upon resume, SDL will attempt to restore the GL context automatically.
+In modern devices (Android 3.0 and up) this will most likely succeed and your
+app can continue to operate as it was.
+However, there's a chance (on older hardware, or on systems under heavy load),
+where the GL context can not be restored. In that case you have to listen for
+a specific message, (which is not yet implemented!) and restore your textures
+manually or quit the app (which is actually the kind of behaviour you'll see
+under iOS, if the OS can not restore your GL context it will just kill your app)
+
+================================================================================
+ Threads and the JAVA VM
+================================================================================
+
+For a quick tour on how Linux native threads interoperate with the JAVA VM, take
+a look here: http://developer.android.com/guide/practices/jni.html
+If you want to use threads in your SDL app, it's strongly recommended that you
+do so by creating them using SDL functions. This way, the required attach/detach
+handling is managed by SDL automagically. If you have threads created by other
+means and they make calls to SDL functions, make sure that you call
+Android_JNI_SetupThread before doing anything else otherwise SDL will attach
+your thread automatically anyway (when you make an SDL call), but it'll never
+detach it.
+
 ================================================================================
  Additional documentation
 ================================================================================
@@ -94,7 +126,7 @@ Once you've copied the SDL android project and customized it, you can create an
  * Select the Android -> Android Project wizard and click Next
  * Enter the name you'd like your project to have
  * Select "Create project from existing source" and browse for your project directory
- * Make sure the Build Target is set to Android 1.6
+ * Make sure the Build Target is set to Android 2.0
  * Click Finish
 
 

diff --git a/src/SDL/README.iOS b/src/SDL/README.iOS
@@ -16,6 +16,26 @@ There are three build targets:
 - Template:
 	Package a project template together with the SDL for iPhone static libraries and copies of the SDL headers.  The template includes proper references to the SDL library and headers, skeleton code for a basic SDL program, and placeholder graphics for the application icon and startup screen.
 
+==============================================================================
+Build SDL for iOS from the command line
+==============================================================================
+
+1. cd (PATH WHERE THE SDL CODE IS)/build-scripts
+2. ./iosbuild.sh
+
+If everything goes fine, you should see a build/ios directory, inside there's
+two directories "lib" and "include". 
+"include" contains a copy of the SDL headers that you'll need for your project,
+make sure to configure XCode to look for headers there.
+"lib" contains find two files, libSDL2.a and libSDL2main.a, you have to add both 
+to your XCode project. These libraries contain three architectures in them,
+armv6 for legacy devices, armv7, and i386 (for the simulator).
+By default, iosbuild.sh will autodetect the SDK version you have installed using 
+xcodebuild -showsdks, and build for iOS >= 3.0, you can override this behaviour 
+by setting the MIN_OS_VERSION variable, ie:
+
+MIN_OS_VERSION=4.2 ./iosbuild.sh
+
 ==============================================================================
 Using the Simple DirectMedia Layer for iOS
 ==============================================================================
@@ -58,15 +78,15 @@ Finally, if your application completely redraws the screen each frame, you may f
 Notes -- Keyboard
 ==============================================================================
 
-SDL for iPhone contains several additional functions related to keyboard visibility.  These functions are not part of the SDL standard API, but are necessary for revealing and hiding the iPhone's virtual onscreen keyboard.  You can use them in your own applications by including a copy of the SDL_uikitkeyboard.h header (located in src/video/uikit) in your project.
+The SDL keyboard API has been extended to support on-screen keyboards:
 
-int SDL_iPhoneKeyboardShow(SDL_Window * window) 
+int SDL_ShowScreenKeyboard(SDL_Window * window) 
 	-- reveals the onscreen keyboard.  Returns 0 on success and -1 on error.
-int SDL_iPhoneKeyboardHide(SDL_Window * window) 
+int SDL_HideScreenKeyboard(SDL_Window * window) 
 	-- hides the onscreen keyboard.  Returns 0 on success and -1 on error.
-SDL_bool SDL_iPhoneKeyboardIsShown(SDL_Window * window) 
+SDL_bool SDL_IsScreenKeyboardShown(SDL_Window * window) 
 	-- returns whether or not the onscreen keyboard is currently visible.
-int SDL_iPhoneKeyboardToggle(SDL_Window * window) 	
+int SDL_ToggleScreenKeyboard(SDL_Window * window) 	
 	-- toggles the visibility of the onscreen keyboard.  Returns 0 on success and -1 on error.
 
 ==============================================================================
@@ -94,17 +114,48 @@ Notes -- iPhone SDL limitations
 ==============================================================================
 
 Windows:
-	Full-size, single window applications only.  You cannot create multi-window SDL applications for iPhone OS.  The application window will fill the display, though you have the option of turning on or off the menu-bar (pass SDL_CreateWindow the flag SDL_WINDOW_BORDERLESS).  Presently, landscape mode is not supported.
-
-Video:
-	For real time frame-rates, you are advised to use strictly SDL 2.0 video calls.  Using compatibility video calls uploads an OpenGL texture for each frame drawn, and this operation is excruciatingly slow.
+	Full-size, single window applications only.  You cannot create multi-window SDL applications for iPhone OS.  The application window will fill the display, though you have the option of turning on or off the menu-bar (pass SDL_CreateWindow the flag SDL_WINDOW_BORDERLESS).
 
 Textures:
-	SDL for iPhone Textures supports only SDL_PIXELFORMAT_ABGR8888 and SDL_PIXELFORMAT_RGB24 pixel formats.  This is because texture support in SDL for iPhone is done through OpenGL ES, which supports fewer pixel formats than OpenGL, will not re-order pixel data for you, and has no support for color-paletted formats (without extensions).
-
-Audio:
-	SDL for iPhone does not yet support audio input.
+	The optimal texture formats on iOS are SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_ABGR8888, SDL_PIXELFORMAT_BGR888, and SDL_PIXELFORMAT_RGB24 pixel formats.
 
 Loading Shared Objects:
 	This is disabled by default since it seems to break the terms of the iPhone SDK agreement.  It can be re-enabled in SDL_config_iphoneos.h.
 
+==============================================================================
+Game Center 
+==============================================================================
+
+Game Center integration requires that you break up your main loop in order to yield control back to the system. In other words, instead of running an endless main loop, you run each frame in a callback function, using:
+
+int SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
+
+This will set up the given function to be called back on the animation callback, and then you have to return from main() to let the Cocoa event loop run.
+
+e.g.
+
+extern "C"
+void ShowFrame(void*)
+{
+    ... do event handling, frame logic and rendering
+}
+
+int main(int argc, char *argv[])
+{
+   ... initialize game ...
+
+#if __IPHONEOS__
+        // Initialize the Game Center for scoring and matchmaking
+        InitGameCenter();
+
+        // Set up the game to run in the window animation callback on iOS
+        // so that Game Center and so forth works correctly.
+        SDL_iPhoneSetAnimationCallback(window, 1, ShowFrame, NULL);
+#else
+        while ( running ) {
+                ShowFrame(0);
+                DelayFrame();
+        }
+#endif
+        return 0;
+}
diff --git a/src/SDL/TODO b/src/SDL/TODO
@@ -6,6 +6,7 @@
  * Write automated test case for multi-draw APIs
  * Implement assertion code on iPhone
  * Add __WINDOWS__ in addition to __WIN32__
+ * Write test for fullscreen gamma to check X11 colormap handling
 
  * Check 1.2 revisions:
 	3554 - Need to resolve semantics for locking keys on different platforms
@@ -14,3 +15,4 @@
 	4484, 4485 - Verify that SDL's Windows keyboard handling works correctly
 	4865 - See if this is still needed (mouse coordinate clamping)
 	4866 - See if this is still needed (blocking window repositioning)
+
diff --git a/src/SDL/VisualC/SDL/SDL_VS2008.vcproj b/src/SDL/VisualC/SDL/SDL_VS2008.vcproj
@@ -519,6 +519,10 @@
 				RelativePath="..\..\include\SDL_surface.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\SDL_system.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\SDL_syswm.h"
 				>
@@ -804,6 +808,14 @@
 			RelativePath="..\..\src\render\software\SDL_drawpoint.h"
 			>
 		</File>
+		<File
+			RelativePath="..\..\src\events\SDL_dropevents.c"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\events\SDL_dropevents_c.h"
+			>
+		</File>
 		<File
 			RelativePath="..\..\src\audio\dummy\SDL_dummyaudio.c"
 			>
@@ -1000,6 +1012,14 @@
 			RelativePath="..\..\src\video\SDL_RLEaccel_c.h"
 			>
 		</File>
+		<File
+			RelativePath="..\..\src\render\software\SDL_rotate.c"
+			>
+		</File>
+		<File
+			RelativePath="..\..\src\render\software\SDL_rotate.h"
+			>
+		</File>
 		<File
 			RelativePath="..\..\src\file\SDL_rwops.c"
 			>

diff --git a/src/SDL/VisualC/SDL/SDL_VS2010.vcxproj b/src/SDL/VisualC/SDL/SDL_VS2010.vcxproj
@@ -243,6 +243,7 @@
     <ClInclude Include="..\..\include\SDL_shape.h" />
     <ClInclude Include="..\..\include\SDL_stdinc.h" />
     <ClInclude Include="..\..\include\SDL_surface.h" />
+    <ClInclude Include="..\..\include\SDL_system.h" />
     <ClInclude Include="..\..\include\SDL_syswm.h" />
     <ClInclude Include="..\..\include\SDL_thread.h" />
     <ClInclude Include="..\..\include\SDL_timer.h" />
@@ -272,7 +273,9 @@
     <ClInclude Include="..\..\src\render\software\SDL_draw.h" />
     <ClInclude Include="..\..\src\render\software\SDL_drawline.h" />
     <ClInclude Include="..\..\src\render\software\SDL_drawpoint.h" />
+    <ClInclude Include="..\..\src\events\SDL_dropevents_c.h" />
     <ClInclude Include="..\..\src\render\software\SDL_render_sw_c.h" />
+    <ClInclude Include="..\..\src\render\software\SDL_rotate.h" />
     <ClInclude Include="..\..\src\video\dummy\SDL_nullframebuffer_c.h" />
     <ClInclude Include="..\..\src\video\SDL_blit.h" />
     <ClInclude Include="..\..\src\video\SDL_blit_auto.h" />
@@ -356,6 +359,7 @@
     <ClCompile Include="..\..\src\render\software\SDL_drawline.c" />
     <ClCompile Include="..\..\src\render\software\SDL_drawpoint.c" />
     <ClCompile Include="..\..\src\render\software\SDL_render_sw.c" />
+    <ClCompile Include="..\..\src\render\software\SDL_rotate.c" />
     <ClCompile Include="..\..\src\SDL.c" />
     <ClCompile Include="..\..\src\SDL_assert.c" />
     <ClCompile Include="..\..\src\atomic\SDL_atomic.c" />
@@ -383,6 +387,7 @@
     <ClCompile Include="..\..\src\audio\disk\SDL_diskaudio.c" />
     <ClCompile Include="..\..\src\audio\dummy\SDL_dummyaudio.c" />
     <ClCompile Include="..\..\src\audio\directsound\SDL_directsound.c" />
+    <ClCompile Include="..\..\src\events\SDL_dropevents.c" />
     <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c" />
     <ClCompile Include="..\..\src\joystick\windows\SDL_dxjoystick.c" />
     <ClCompile Include="..\..\src\SDL_error.c" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		update SDL from original repo
		update with latest SDL repo