6 Commits

Author	SHA1	Message	Date
minggo	bcb171e3c9	fix line end in windows	2013-09-20 22:23:13 +08:00
CaiWenzhi	9d07b2c1d2	Temp commit	2013-09-17 20:13:23 +08:00
CaiWenzhi	9d6d9dcd19	Add getDescription method	2013-09-17 17:59:20 +08:00
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