6 Commits (ef3156e6f748bc075aba432ec2847791cd1962f0)

Author	SHA1	Message	Date
ibuler	7b792907d3	merge with dev	2015-12-19 17:27:12 +08:00
ibuler	c103738302	merge with dev	2015-12-19 17:26:34 +08:00
ibuler	e2ac212fc3	resolve confilict	2015-04-20 20:56:26 +08:00
ibuler	09d3763a02	fix a bug	2015-04-20 20:54:10 +08:00
ibuler	412dadce76	version 2.0.0 beta	2015-04-20 10:12:11 +08:00
halcyon	a42d053cbb	新弹窗等	2015-02-10 18:57:43 +08:00