从笔记本更新
添加内容
添加列表item滑动雏形
添加必要的文件
测试git保存密码
测试保存密码
添加详细内容页面
自定义滑动组件
aaaa
Merge branch 'master' of https://github.com/lee4755026/TwentyOneDays

Conflicts:
	TwentyOneDays/AndroidManifest.xml
	TwentyOneDays/res/drawable-hdpi/add.png
	TwentyOneDays/res/drawable-hdpi/add_down.png
	TwentyOneDays/res/drawable-hdpi/remove.png
	TwentyOneDays/res/layout/activity_detail.xml
	TwentyOneDays/res/layout/activity_main.xml
	TwentyOneDays/res/layout/list_item.xml
	TwentyOneDays/res/values/dimens.xml
	TwentyOneDays/res/values/styles.xml
	TwentyOneDays/src/com/famo/twentyonedays/adapter/PlansAdapter.java
	TwentyOneDays/src/com/famo/twentyonedays/model/PlanEntry.java
	TwentyOneDays/src/com/famo/twentyonedays/ui/DetailActivity.java
	TwentyOneDays/src/com/famo/twentyonedays/ui/MainActivity.java
	TwentyOneDays/src/com/famo/twentyonedays/ui/widget/SlideViewWidget.java
	TwentyOneDays/src/com/famo/twentyonedays/utils/Tools.java
修改日历显示