11 Commits

Author	SHA1	Message	Date
numbbbbb	431269279b	resolve conflict	2014-06-14 20:41:51 +08:00
stanzhai	b0d128de21	fix 2.14 initialization	2014-06-14 17:58:37 +08:00
stanzhai	e13d4f3cb7	fix 2.13 inheritance	2014-06-14 17:55:09 +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
stanzhai	9698ddc391	add underline -----------------	2014-06-10 20:00:15 +08:00
Hawstein	c37567afe9	02/13 Inheritance Done!	2014-06-08 18:47:09 +08:00
Hawstein	e158315c28	update 02/13	2014-06-08 18:47:09 +08:00
numbbbbb	46ced46a0a	make the structure standard	2014-06-05 10:27:37 +08:00