# HG changeset patch
# User Jim Grandpre <jim.tla@gmail.com>
# Date 1279423017 14400
# Node ID a8ef4c3a5d8e0704c8b53604fa4e4f63c346eaeb
# Parent  0ecdbabdd7e71685191a353f042e894e5e08e5ee# Parent  52e871f486b80a799e46209cee7698652b1393a3
Merged changes

diff -r 52e871f486b8 -r a8ef4c3a5d8e src/events/SDL_gesture_c.h
--- a/src/events/SDL_gesture_c.h	Fri Jul 16 22:16:05 2010 -0700
+++ b/src/events/SDL_gesture_c.h	Sat Jul 17 23:16:57 2010 -0400
@@ -28,6 +28,8 @@
 
 extern int SDL_RecordGesture(int touchId);
 
+extern int SDL_GestureAddTouch(SDL_Touch* touch);
+
 #endif /* _SDL_gesture_c_h */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff -r 52e871f486b8 -r a8ef4c3a5d8e src/events/SDL_touch.c
--- a/src/events/SDL_touch.c	Fri Jul 16 22:16:05 2010 -0700
+++ b/src/events/SDL_touch.c	Sat Jul 17 23:16:57 2010 -0400
@@ -38,8 +38,7 @@
 int
 SDL_TouchInit(void)
 {
-    
-    return (0);
+  return (0);
 }
 
 SDL_Touch *