7 Commits

Author	SHA1	Message	Date
rui.zheng	e159216280	override KCP crypt and key if specified explicitly	2016-10-28 16:12:13 +08:00
rui.zheng	89d044ad12	merge branch 2.3	2016-10-25 12:18:16 +08:00
rui.zheng	9feb67c302	update README_en.md	2016-10-23 18:37:50 +08:00
rui.zheng	67a9b8d0ee	add README_en.md	2016-10-22 10:15:29 +08:00
rui.zheng	944af50639	update README	2016-10-22 10:11:46 +08:00
rui.zheng	8552498992	update README	2016-10-21 22:21:57 +08:00
rui.zheng	21d4a53728	update README	2016-10-21 18:07:49 +08:00