10 Commits

Author	SHA1	Message	Date
stanzhai	df9d6bd803	merge 2.21,3.5 confilicts	2014-06-14 23:06:20 +08:00
stanzhai	7c5cd7067c	fix 3.5 declarations	2014-06-14 22:08:24 +08:00
numbbbbb	431269279b	resolve conflict	2014-06-14 20:41:51 +08:00
wuxing	a516af6a53	fix 他	2014-06-14 17:25:03 +08:00
wuxing	1c10a65bd3	统一标准	2014-06-14 16:43:18 +08:00
wuxing	7011436cef	modify right back	2014-06-14 15:57:52 +08:00
wuxing	9547fd69fe	modify	2014-06-14 15:49:19 +08:00
stanzhai	8519bfad0a	correct declarations grammar	2014-06-14 14:18:51 +08:00
numbbbbb	75426a3479	ver 1.0	2014-06-12 07:40:02 +08:00
numbbbbb	46ced46a0a	make the structure standard	2014-06-05 10:27:37 +08:00