Commit Graph

2 Commits

Author SHA1 Message Date
Ricardo Quesada 8df96b1a6e Layercolor uses the new API 2013-12-06 17:59:34 -08:00
Nite Luo fbadb3329a Merge branch 'develop' into newRenderer
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-02 10:55:31 -08:00