Signed-off-by: gqjjqg <qijiang.guo@gmail.com>
Merge branch 'master' of https://github.com/gqjjqg/android-game-demo.git

Conflicts:
	GameDemo/bin/classes/com/gqj/GameDemo/CMainEntry.class
	GameDemo/bin/classes/com/gqj/GameDemo/JNI/CMemManage.class
	GameDemo/bin/classes/com/gqj/GameDemo/MainActivity.class
	GameDemo/bin/classes/com/gqj/GameDemo/Platform/WINDOWS.class
	GameDemo/bin/classes/com/gqj/GameDemo/UI/GButtons.class
update lib
Signed-off-by: gqjjqg <qijiang.guo@gmail.com>