Commit Graph

3 Commits

Author SHA1 Message Date
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
Gerhard Stein
11de2e30d6 png updates 2013-10-09 21:07:54 +02:00
Sergii Pylypenko
393ed4ce9b Fixed libpng compilation 2013-09-24 22:34:06 +03:00