7 Commits

Author	SHA1	Message	Date
cai wenzhi	683d3c9f14	Merge branch 'develop' into develop_nutty_modify_framework_for315	2014-03-02 19:28:44 +08:00
andyque	bf81591b48	fixed #3829. change namespace gui to ui	2014-02-25 10:18:44 +08:00
CaiWenzhi	bea46fa290	Add clone method to LayoutParameter	2014-01-17 13:10:04 +08:00
walzer	d4c1aa92d5	add copyrights for 2014, in folders other then 2d.	2014-01-07 11:47:11 +08:00
CaiWenzhi	9aa85d2bd6	Remove NodeRGBA inherit	2013-12-23 15:02:52 +08:00
CaiWenzhi	611ba9e9f5	Modify code criterion	2013-11-14 11:37:46 +08:00
CaiWenzhi	e0aa82da13	Merge master branch to develop branch	2013-11-06 16:04:06 +08:00