Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/tileMap_parallax_nodes
History
natural-law e38d3a2277 Merge branch 'master' into iss434 
Conflicts:
	cocos2dx/platform/airplay/CCFileUtils_airplay.h
	template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
 		2011-03-28 17:06:32 +08:00
..
CCParallaxNode.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCTMXLayer.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCTMXObjectGroup.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
CCTMXTiledMap.cpp fix compilation error when COCOS2D_DEBUG = 2 2011-03-21 10:50:24 +08:00
CCTMXXMLParser.cpp Merge branch 'master' into iss434 2011-03-28 17:06:32 +08:00
CCTileMapAtlas.cpp fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00