157 Commits

Author	SHA1	Message	Date
Huabing.Xu	29c345bd02	Merge branch 'develop' into develop_migrate_math_lib_merge	2014-04-04 18:45:21 +08:00
Huabing.Xu	960ac300d5	migrate cocostudio to director matrix stack	2014-04-03 14:55:55 +08:00
andyque	fe33588038	issue #4636. finish UILayout	2014-04-03 11:14:35 +08:00
CaiWenzhi	a05969c395	Move layout "exe" to cpp	2014-03-26 17:58:53 +08:00
CaiWenzhi	243b7e5822	Modify layout and add Boxes	2014-03-25 17:15:54 +08:00
CaiWenzhi	2dffcb9808	Add ProtectedNode and remove "addNode"	2014-03-25 14:28:58 +08:00
andyque	cbcc1bbbcf	let ios project compile correct	2014-03-11 18:48:26 +08:00