7 Commits

Author	SHA1	Message	Date
numbbbbb	431269279b	resolve conflict	2014-06-14 20:41:51 +08:00
stanzhai	c27fad956a	fix 2.13 inheritance（2）	2014-06-14 17:59:04 +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
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