Merged changes
authorSam Lantinga <slouken@libsdl.org>
Sat, 01 Jun 2013 12:53:32 -0700
changeset 72569cad21f6fa4e
parent 7255 ea30c1b99365
parent 7254 497b83000293
child 7257 5997d00782e8
Merged changes
     1.1 --- a/src/events/SDL_gesture.c	Sat Jun 01 12:53:06 2013 -0700
     1.2 +++ b/src/events/SDL_gesture.c	Sat Jun 01 12:53:32 2013 -0700
     1.3 @@ -11,11 +11,11 @@
     1.4    freely, subject to the following restrictions:
     1.5  
     1.6    1. The origin of this software must not be misrepresented; you must not
     1.7 -  claim that you wrote the original software. If you use this software
     1.8 -  in a product, an acknowledgment in the product documentation would be
     1.9 -  appreciated but is not required.
    1.10 +     claim that you wrote the original software. If you use this software
    1.11 +     in a product, an acknowledgment in the product documentation would be
    1.12 +     appreciated but is not required.
    1.13    2. Altered source versions must be plainly marked as such, and must not be
    1.14 -  misrepresented as being the original software.
    1.15 +     misrepresented as being the original software.
    1.16    3. This notice may not be removed or altered from any source distribution.
    1.17  */
    1.18  
     2.1 --- a/src/video/android/SDL_androidvideo.c	Sat Jun 01 12:53:06 2013 -0700
     2.2 +++ b/src/video/android/SDL_androidvideo.c	Sat Jun 01 12:53:32 2013 -0700
     2.3 @@ -83,7 +83,6 @@
     2.4  static SDL_VideoDevice *
     2.5  Android_CreateDevice(int devindex)
     2.6  {
     2.7 -    printf("Creating video device\n");
     2.8      SDL_VideoDevice *device;
     2.9      SDL_VideoData *data;
    2.10  
     3.1 --- a/src/video/android/SDL_androidwindow.c	Sat Jun 01 12:53:06 2013 -0700
     3.2 +++ b/src/video/android/SDL_androidwindow.c	Sat Jun 01 12:53:32 2013 -0700
     3.3 @@ -23,6 +23,8 @@
     3.4  #if SDL_VIDEO_DRIVER_ANDROID
     3.5  
     3.6  #include "../SDL_sysvideo.h"
     3.7 +#include "../../events/SDL_keyboard_c.h"
     3.8 +#include "../../events/SDL_mouse_c.h"
     3.9  
    3.10  #include "SDL_androidvideo.h"
    3.11  #include "SDL_androidwindow.h"