Gerhard Stein 018477617d Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android ...

Conflicts:
	project/jni/png/include/pnglibconf.h

2013-10-09 21:09:26 +02:00

..

png.h

Updated libpng to version 16 and added sdl2_image for sdl2

2013-09-22 19:24:32 +02:00

pngconf.h

Updated libpng to version 16 and added sdl2_image for sdl2

2013-09-22 19:24:32 +02:00

pnglibconf.h

Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

2013-10-09 21:09:26 +02:00