update to latest SDL

2012-10-14 23:44:30 +02:00 · 2012-10-14 23:44:30 +02:00 · 86327f2ea9
commit 86327f2ea9
parent e76b539bb3
685 changed files with 25090 additions and 24781 deletions
--- 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
--- a/src/SDL/.hg/cache/tags
+++ b/src/SDL/.hg/cache/tags
@ -1,5 +1,5 @@
-6309 f4e14c811fd52e34ee70aaebdd812965c17cb192 a1616a61e966c1b1136d6ca57a0e7165441d603a
+6593 404571a5752382f75a0b0a170bacc88dfc948233 a1616a61e966c1b1136d6ca57a0e7165441d603a
-6308 2b923729fd01d34b3913bd4ac8458c7121825f78 bb426bf40cac1882c852d81a696d72abf05ee755
+6588 bc23c3b164fa0ea601555de0e224a952f70c06ef bb426bf40cac1882c852d81a696d72abf05ee755
 5551 b95bb58b703af987349d3603a7d008e11a061d7a a1616a61e966c1b1136d6ca57a0e7165441d603a
 5079 f2d8e0b59ccac6688e7a5c89399f7c842507968e a1616a61e966c1b1136d6ca57a0e7165441d603a
 4416 06be4b33029d9e4012380084dd37dc1730062921
--- a/src/SDL/.hg/dirstate
+++ b/src/SDL/.hg/dirstate
--- 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
--- a/src/SDL/.hg/store/00changelog.d
+++ b/src/SDL/.hg/store/00changelog.d
--- a/src/SDL/.hg/store/00changelog.i
+++ b/src/SDL/.hg/store/00changelog.i
--- a/src/SDL/.hg/store/00manifest.d
+++ b/src/SDL/.hg/store/00manifest.d
--- a/src/SDL/.hg/store/00manifest.i
+++ b/src/SDL/.hg/store/00manifest.i
--- a/src/SDL/.hg/store/data/_android.mk.i
+++ b/src/SDL/.hg/store/data/_android.mk.i
--- a/src/SDL/.hg/store/data/_makefile.in.i
+++ b/src/SDL/.hg/store/data/_makefile.in.i
--- 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
--- 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
--- 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
--- a/src/SDL/.hg/store/data/_t_o_d_o.i
+++ b/src/SDL/.hg/store/data/_t_o_d_o.i
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/src/SDL/.hg/store/data/acinclude/accheckdefine.m4.i
+++ b/src/SDL/.hg/store/data/acinclude/accheckdefine.m4.i
--- a/src/SDL/.hg/store/data/acinclude/libtool.m4.d
+++ b/src/SDL/.hg/store/data/acinclude/libtool.m4.d
--- a/src/SDL/.hg/store/data/acinclude/libtool.m4.i
+++ b/src/SDL/.hg/store/data/acinclude/libtool.m4.i
--- a/src/SDL/.hg/store/data/acinclude/ltoptions.m4.i
+++ b/src/SDL/.hg/store/data/acinclude/ltoptions.m4.i
--- a/src/SDL/.hg/store/data/acinclude/ltsugar.m4.i
+++ b/src/SDL/.hg/store/data/acinclude/ltsugar.m4.i
--- a/src/SDL/.hg/store/data/acinclude/ltversion.m4.i
+++ b/src/SDL/.hg/store/data/acinclude/ltversion.m4.i
--- a/src/SDL/.hg/store/data/acinclude/lt~7eobsolete.m4.i
+++ b/src/SDL/.hg/store/data/acinclude/lt~7eobsolete.m4.i
--- a/src/SDL/.hg/store/data/aclocal.m4.i
+++ b/src/SDL/.hg/store/data/aclocal.m4.i
--- a/src/SDL/.hg/store/data/android-project/_android_manifest.xml.i
+++ b/src/SDL/.hg/store/data/android-project/_android_manifest.xml.i
--- 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
--- a/src/SDL/.hg/store/data/build-scripts/config.guess.i
+++ b/src/SDL/.hg/store/data/build-scripts/config.guess.i
--- a/src/SDL/.hg/store/data/build-scripts/config.sub.i
+++ b/src/SDL/.hg/store/data/build-scripts/config.sub.i
--- a/src/SDL/.hg/store/data/build-scripts/fatbuild.sh.i
+++ b/src/SDL/.hg/store/data/build-scripts/fatbuild.sh.i
--- a/src/SDL/.hg/store/data/build-scripts/iosbuild.sh.i
+++ b/src/SDL/.hg/store/data/build-scripts/iosbuild.sh.i
--- a/src/SDL/.hg/store/data/build-scripts/ltmain.sh.d
+++ b/src/SDL/.hg/store/data/build-scripts/ltmain.sh.d
--- a/src/SDL/.hg/store/data/build-scripts/ltmain.sh.i
+++ b/src/SDL/.hg/store/data/build-scripts/ltmain.sh.i
--- a/src/SDL/.hg/store/data/configure.d
+++ b/src/SDL/.hg/store/data/configure.d
--- a/src/SDL/.hg/store/data/configure.i
+++ b/src/SDL/.hg/store/data/configure.i
--- a/src/SDL/.hg/store/data/configure.in.d
+++ b/src/SDL/.hg/store/data/configure.in.d
--- a/src/SDL/.hg/store/data/configure.in.i
+++ b/src/SDL/.hg/store/data/configure.in.i
--- a/src/SDL/.hg/store/data/include/_s_d_l.h.i
+++ b/src/SDL/.hg/store/data/include/_s_d_l.h.i
--- 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
--- 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
--- 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
--- a/src/SDL/.hg/store/data/include/_s_d_lconfigandroid.h.i
+++ b/src/SDL/.hg/store/data/include/_s_d_lconfigandroid.h.i
--- a/src/SDL/.hg/store/data/include/_s_d_lconfigmacosx.h.i
+++ b/src/SDL/.hg/store/data/include/_s_d_lconfigmacosx.h.i
--- a/src/SDL/.hg/store/data/include/_s_d_lconfigpandora.h.i
+++ b/src/SDL/.hg/store/data/include/_s_d_lconfigpandora.h.i
--- a/src/SDL/.hg/store/data/include/_s_d_lconfigwindows.h.i
+++ b/src/SDL/.hg/store/data/include/_s_d_lconfigwindows.h.i
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/src/SDL/.hg/store/data/src/_s_d_l.c.i
+++ b/src/SDL/.hg/store/data/src/_s_d_l.c.i
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/src/SDL/.hg/store/data/src/audio/qsa/_s_d_lqsaaudio.c.i
+++ b/src/SDL/.hg/store/data/src/audio/qsa/_s_d_lqsaaudio.c.i
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/src/SDL/.hg/store/data/src/main/android/_s_d_landroidmain.cpp.i
+++ b/src/SDL/.hg/store/data/src/main/android/_s_d_landroidmain.cpp.i
--- a/src/SDL/.hg/store/data/src/main/windows/_s_d_lwindowsmain.c.i
+++ b/src/SDL/.hg/store/data/src/main/windows/_s_d_lwindowsmain.c.i
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/src/SDL/.hg/store/data/src/render/_s_d_lyuvsw.c.i
+++ b/src/SDL/.hg/store/data/src/render/_s_d_lyuvsw.c.i
--- a/src/SDL/.hg/store/data/src/render/direct3d/_s_d_lrenderd3d.c.i
+++ b/src/SDL/.hg/store/data/src/render/direct3d/_s_d_lrenderd3d.c.i
--- a/Show more
+++ b/Show more
		`@ -1 +1 @@`
			`update SDL from original repo`				`update with latest SDL repo`