14 Commits

Include renames

Author	SHA1	Message	Date
WMJ	03c26d5e68	active	2017-04-28 19:05:21 +08:00
WMJ	a9f1d0fad9	更新plan	2017-04-25 20:03:55 +08:00
WMJ	47a5b06bf8	第一个次合并代码	2017-04-25 19:42:55 +08:00
WMJ	71d16852f7	修正Fragment为v4.Fragment	2017-04-25 19:40:37 +08:00
WMJ	a90b5d6588	Merge branch 'dev' of github.com:WeSayAll/TimeManager into dev ... 必要性	2017-04-25 19:35:04 +08:00
WMJ	a18899be35	加入课程对话框	2017-04-25 19:34:41 +08:00
YouDad	08aae655b2	Fix some warning.	2017-04-25 19:29:55 +08:00
YouDad	48ff81eb41	Merge Successed. ... Don't forget the original data in the code before using. The original data in the function:'initializing()'.	2017-04-25 18:52:03 +08:00
WMJ	9e78e26c42	合并代码成功	2017-04-24 20:40:11 +08:00
WMJ	93fb4b8e67	活动基础列表	2017-04-22 12:24:44 +08:00
WMJ	a82412f1d4	xml文件模块完成	2017-04-21 11:52:50 +08:00
WMJ	3f6fe23eda	test	2017-04-21 09:32:50 +08:00
WMJ	8dc2b70262	通用工具包	2017-04-21 08:51:15 +08:00
WMJ	64b2936636	~	2017-04-18 17:19:02 +08:00