changeset 4668:a8ef4c3a5d8e

Merged changes
author Jim Grandpre <jim.tla@gmail.com>
date Sat, 17 Jul 2010 23:16:57 -0400
parents 0ecdbabdd7e7 (diff) 52e871f486b8 (current diff)
children 62e6a6e9720b
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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: */
--- 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 *