Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions/GUI
History
James Chen 46009e5daf Merge commit 'refs/pull/4085/head' of git://github.com/cocos2d/cocos2d-x into iss3619 
Conflicts:
	extensions/GUI/CCControlExtension/CCControlButton.cpp
 		2014-01-09 11:16:44 +08:00
..
CCControlExtension Merge commit 'refs/pull/4085/head' of git://github.com/cocos2d/cocos2d-x into iss3619 2014-01-09 11:16:44 +08:00
CCEditBox Adds override keyword for override functions. 2014-01-04 18:12:09 +08:00
CCScrollView ScrollView::intWithView supports be invoked several times. 2014-01-07 22:16:24 +08:00