Merged changes
authorSam Lantinga <slouken@libsdl.org>
Sat, 01 Jun 2013 12:53:32 -0700
changeset 7256 9cad21f6fa4e
parent 7255 ea30c1b99365 (current diff)
parent 7254 497b83000293 (diff)
child 7257 5997d00782e8
Merged changes
--- a/src/events/SDL_gesture.c	Sat Jun 01 12:53:06 2013 -0700
+++ b/src/events/SDL_gesture.c	Sat Jun 01 12:53:32 2013 -0700
@@ -11,11 +11,11 @@
   freely, subject to the following restrictions:
 
   1. The origin of this software must not be misrepresented; you must not
-  claim that you wrote the original software. If you use this software
-  in a product, an acknowledgment in the product documentation would be
-  appreciated but is not required.
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
   2. Altered source versions must be plainly marked as such, and must not be
-  misrepresented as being the original software.
+     misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
 
--- a/src/video/android/SDL_androidvideo.c	Sat Jun 01 12:53:06 2013 -0700
+++ b/src/video/android/SDL_androidvideo.c	Sat Jun 01 12:53:32 2013 -0700
@@ -83,7 +83,6 @@
 static SDL_VideoDevice *
 Android_CreateDevice(int devindex)
 {
-    printf("Creating video device\n");
     SDL_VideoDevice *device;
     SDL_VideoData *data;
 
--- a/src/video/android/SDL_androidwindow.c	Sat Jun 01 12:53:06 2013 -0700
+++ b/src/video/android/SDL_androidwindow.c	Sat Jun 01 12:53:32 2013 -0700
@@ -23,6 +23,8 @@
 #if SDL_VIDEO_DRIVER_ANDROID
 
 #include "../SDL_sysvideo.h"
+#include "../../events/SDL_keyboard_c.h"
+#include "../../events/SDL_mouse_c.h"
 
 #include "SDL_androidvideo.h"
 #include "SDL_androidwindow.h"