Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/samples.xcodeproj
History
Ricardo Quesada e0523b3438 Merge branch 'developNewLabelForRiq' into label_merge 
Conflicts:
	cocos2dx/textures/CCTexture2D.h
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
	scripting/javascript/bindings/generated
	tools/bindings-generator
 		2013-07-24 15:15:08 -07:00
..
project.pbxproj.REMOVED.git-id Merge branch 'developNewLabelForRiq' into label_merge 2013-07-24 15:15:08 -07:00