Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Merged changes

  • Loading branch information
slouken committed Jun 1, 2013
2 parents 3b2d473 + 2cbe877 commit 9f7eeb146b896d19dc2733a1b59e15f5acf3d98e
Showing with 6 additions and 5 deletions.
  1. +4 −4 src/events/SDL_gesture.c
  2. +0 −1 src/video/android/SDL_androidvideo.c
  3. +2 −0 src/video/android/SDL_androidwindow.c
@@ -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.
*/

@@ -83,7 +83,6 @@ Android_DeleteDevice(SDL_VideoDevice * device)
static SDL_VideoDevice *
Android_CreateDevice(int devindex)
{
printf("Creating video device\n");
SDL_VideoDevice *device;
SDL_VideoData *data;

@@ -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"

0 comments on commit 9f7eeb1

Please sign in to comment.