Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android
authorGerhard Stein <gerstrong@gmail.com>
Fri, 21 Dec 2012 07:50:11 +0000 (08:50 +0100)
committerGerhard Stein <gerstrong@gmail.com>
Fri, 21 Dec 2012 07:50:11 +0000 (08:50 +0100)
commit67fbc6822d754f670dba9da7bfda6e43648167f8
tree4129478a2382e53b5f387369e135244018d76dbf
parent3c507586d159d4658a89ec1831cf8c820327533f
parentd44b62ed72e1b4c270870c5f0ba654f6ec469ab5
Merge branch 'sdl_android' of github.com:pelya/commandergenius into sdl_android

Conflicts:
project/jni/application/commandergenius/commandergenius