2 Commits

Author	SHA1	Message	Date
lionsoul	7a2b9943b5	stdlize the license add free statement	2016-12-28 09:53:13 +08:00
狮子的魂	f0c91e70b9	conflicts fixed	2015-12-08 21:40:44 +08:00