axmol/cocos2dx/proj.win32
Phenix Yu e623cd6357 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Conflicts:
	cocos2dx/include/CCTexture2D.h
	cocos2dx/include/ccMacros.h
	cocos2dx/textures/CCTexture2D.cpp
	lua/cocos2dx_support/LuaCocos2d.cpp
2012-04-15 15:46:01 +08:00
..
cocos2d-win32.vcproj updated win32 projects configuration release version. 2012-04-10 23:09:58 +08:00
cocos2d-win32.vcxproj fixed getContentSize pass by reference issue 2012-04-14 17:13:38 +08:00
cocos2d-win32.vcxproj.filters update for msvc2010 2012-04-09 00:10:12 +08:00
cocos2d-win32.vcxproj.user Add VC2010 project files on win32 2011-03-10 19:50:17 +08:00