3 Commits

Author	SHA1	Message	Date
CaiWenzhi	ca599b4852	Merge guy to 3.0 branch	2013-09-16 20:54:13 +08:00
James Chen	5ee8ad8c4f	Fix compilation errors for CocoGUI.	2013-09-16 17:12:15 +08:00
CaiWenzhi	4843046d17	Merge GUI to develop step 1;	2013-09-16 17:12:15 +08:00