Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/proj.win32
History
yangws e895d9d073 TextInputTest compile ok on android and merge last master code. 
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input

Conflicts:
	HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
	HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
	HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/platform/android/Cocos2dJni.cpp
	tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
	tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
	tests/test.ios/test.xcodeproj/project.pbxproj
	tests/test.win32/test.win32.vcproj
 		2011-04-26 18:04:07 +08:00
..
cocos2d-win32.vcproj TextInputTest compile ok on android and merge last master code. 2011-04-26 18:04:07 +08:00
cocos2d-win32.vcxproj VC2010 compile ok. 2011-04-07 14:20:04 +08:00
cocos2d-win32.vcxproj.filters VC2010 compile ok. 2011-04-07 14:20:04 +08:00
cocos2d-win32.vcxproj.user Add VC2010 project files on win32 2011-03-10 19:50:17 +08:00