modified:   .classpath
	modified:   bin/R.txt
	modified:   bin/classes.dex
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$bool.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$color.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$dimen.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$drawable.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$id.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$integer.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$layout.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$menu.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$string.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$style.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/R$styleable.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/ActivityStrangers$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/ActivityStrangers.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$1.class
	deleted:    bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$2$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$2.class
	renamed:    bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$1.class -> bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$3.class
	renamed:    bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$2.class -> bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$4.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$AlarmsData.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$MyAdapter$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$MyAdapter$ListClickGroup.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$MyAdapter.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/BaseActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/ChangeAlarmActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity$4.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/LoginActivity$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/LoginActivity$LoginTask.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/LoginActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/MainActivity$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/MainActivity$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/MainActivity$3.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/MainActivity$4.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/MainActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/MessagesFromUsersActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/PositiveEnergyActivity$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/PositiveEnergyActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignUpActivity$3.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignUpActivity$RegisterTask.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/SignUpActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/UserInfoActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/WakeUpActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/WeatherCitiesSettingActivity$3.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/WeatherCitiesSettingActivity$4.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/WeatherCitiesSettingActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/WeatherMainActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/WebPageActivity.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/service/UserNetworkService.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/CavansImageTask.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/FileIOTools.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/GetContects.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/GetUpMediaPlayer.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/MenuFragment$MenuAdapter.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/ReadParseClass.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/WeatherCitiesExpandListAdapter.class
	modified:   bin/classes/cn/jlu/ge/knightView/KnightNumberPicker.class
	modified:   bin/classes/com/actionbarsherlock/R$id.class
	modified:   bin/classes/com/handmark/pulltorefresh/library/R$id.class
	modified:   bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$id.class
	modified:   bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$integer.class
	modified:   bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$layout.class
	modified:   bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$string.class
	modified:   bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$style.class
	modified:   bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$styleable.class
	modified:   bin/dexedLibs/actionbarsherlock-bd388ef04581f5aa9a60a657f13733d6.jar
	modified:   bin/dexedLibs/androidaysnchttp-a416a227154c2991ef69165e5ba9d94f.jar
	modified:   bin/dexedLibs/sliding_menu-514a327db40b6db34265f7443c5834aa.jar
	modified:   bin/jarlist.cache
	modified:   bin/resources.ap_
	modified:   gen/cn/jlu/ge/dreamclock/R.java
	modified:   gen/cn/jlu/ge/dreamclock/service/INetworkTask.java
	modified:   gen/com/actionbarsherlock/R.java
	modified:   gen/com/handmark/pulltorefresh/library/R.java
	modified:   gen/com/jeremyfeinstein/slidingmenu/lib/R.java
	modified:   project.properties
	modified:   res/anim/layout_anim.xml
	modified:   res/layout/activity_alarm_list.xml
	modified:   res/layout/alarm_item.xml
	modified:   res/layout/number_picker.xml
	modified:   res/values-nodpi-1184x720/dimens.xml
	modified:   res/values/dimens.xml
	modified:   res/values/strings.xml
	modified:   src/cn/jlu/ge/dreamclock/activity/AlarmListActivity.java
	modified:   src/cn/jlu/ge/dreamclock/activity/MainActivity.java
	modified:   src/cn/jlu/ge/dreamclock/tools/GetContects.java

 Untracked files:
	bin/DreamClock.apk
	bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$4$1.class
	bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$5.class
	bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$6.class
	bin/dexedLibs/android-async-http-1.4.3-30267fdba1e4209b62ba97ecf42cf368.jar
	bin/dexedLibs/android-support-v4-36019d828f9fbb00fc0991b38305a663.jar
	bin/dexedLibs/android-support-v4-d29e454c0bd13d126bac8a39992edffe.jar
	bin/dexedLibs/library-84a334a5b2f7e9aa79dd9bfb0f1e8180.jar
Merge branch 'mybranch'

Conflicts:
	bin/R.txt
	bin/classes.dex
	bin/classes/cn/jlu/ge/dreamclock/R$dimen.class
	bin/classes/cn/jlu/ge/dreamclock/R$drawable.class
	bin/classes/cn/jlu/ge/dreamclock/R$id.class
	bin/classes/cn/jlu/ge/dreamclock/R$integer.class
	bin/classes/cn/jlu/ge/dreamclock/R$layout.class
	bin/classes/cn/jlu/ge/dreamclock/R$menu.class
	bin/classes/cn/jlu/ge/dreamclock/R$string.class
	bin/classes/cn/jlu/ge/dreamclock/R$style.class
	bin/classes/cn/jlu/ge/dreamclock/R$styleable.class
	bin/classes/cn/jlu/ge/dreamclock/activity/ActivityStrangers$1.class
	bin/classes/cn/jlu/ge/dreamclock/activity/ActivityStrangers.class
	bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$MyAdapter.class
	bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/BaseActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/ChangeAlarmActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity$2.class
	bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity$4.class
	bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/LoginActivity$2.class
	bin/classes/cn/jlu/ge/dreamclock/activity/LoginActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/MainActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/MessagesFromUsersActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/PositiveEnergyActivity$2.class
	bin/classes/cn/jlu/ge/dreamclock/activity/PositiveEnergyActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$1.class
	bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity$UsersSignInAdapter.class
	bin/classes/cn/jlu/ge/dreamclock/activity/SignInActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/SignUpActivity$3.class
	bin/classes/cn/jlu/ge/dreamclock/activity/SignUpActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/UserInfoActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/WakeUpActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/WeatherCitiesSettingActivity$3.class
	bin/classes/cn/jlu/ge/dreamclock/activity/WeatherCitiesSettingActivity$4.class
	bin/classes/cn/jlu/ge/dreamclock/activity/WeatherCitiesSettingActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/WeatherMainActivity.class
	bin/classes/cn/jlu/ge/dreamclock/activity/WebPageActivity.class
	bin/classes/cn/jlu/ge/dreamclock/tools/MenuFragment$MenuAdapter.class
	bin/classes/cn/jlu/ge/dreamclock/tools/WeatherCitiesExpandListAdapter.class
	bin/classes/cn/jlu/ge/knightView/KnightNumberPicker.class
	bin/classes/com/handmark/pulltorefresh/library/R$id.class
	bin/classes/com/jeremyfeinstein/slidingmenu/lib/R$id.class
	bin/resources.ap_
	gen/cn/jlu/ge/dreamclock/R.java
	gen/com/handmark/pulltorefresh/library/R.java
	gen/com/jeremyfeinstein/slidingmenu/lib/R.java

 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/MERGE_HEAD
 and try again.

 Please enter the commit message for your changes. Lines starting
 with '' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch is up-to-date with 'origin/master'.

 All conflicts fixed but you are still merging.

 Changes to be committed:
	modified:   .classpath
	modified:   bin/R.txt
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$1.class
	deleted:    bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$2$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$2.class
	renamed:    bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$1.class -> bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$3.class
	renamed:    bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$2.class -> bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$4.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$AlarmsData.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$MyAdapter$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/AlarmListActivity$MyAdapter$ListClickGroup.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/MainActivity$1.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/MainActivity$2.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/MainActivity$3.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/activity/MainActivity$4.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/service/UserNetworkService.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/CavansImageTask.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/FileIOTools.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/GetContects.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/GetUpMediaPlayer.class
	modified:   bin/classes/cn/jlu/ge/dreamclock/tools/ReadParseClass.class
	modified:   bin/dexedLibs/actionbarsherlock-bd388ef04581f5aa9a60a657f13733d6.jar
	modified:   bin/dexedLibs/androidaysnchttp-a416a227154c2991ef69165e5ba9d94f.jar
	modified:   bin/dexedLibs/sliding_menu-514a327db40b6db34265f7443c5834aa.jar
	modified:   bin/jarlist.cache
	modified:   gen/cn/jlu/ge/dreamclock/R.java
	modified:   gen/cn/jlu/ge/dreamclock/service/INetworkTask.java
	modified:   gen/com/handmark/pulltorefresh/library/R.java
	modified:   gen/com/jeremyfeinstein/slidingmenu/lib/R.java
	modified:   project.properties
	modified:   res/anim/layout_anim.xml
	modified:   res/layout/activity_alarm_list.xml
	modified:   res/layout/alarm_item.xml
	modified:   res/layout/number_picker.xml
	modified:   res/values-nodpi-1184x720/dimens.xml
	modified:   res/values/dimens.xml
	modified:   res/values/strings.xml
	modified:   src/cn/jlu/ge/dreamclock/activity/AlarmListActivity.java
	modified:   src/cn/jlu/ge/dreamclock/activity/MainActivity.java
	modified:   src/cn/jlu/ge/dreamclock/tools/GetContects.java

 Untracked files:
	bin/DreamClock.apk
	bin/classes/cn/jlu/ge/dreamclock/activity/ActivityStrangers$GetDataTask.class
	bin/classes/cn/jlu/ge/dreamclock/activity/ActivityStrangers$Holder.class
	bin/classes/cn/jlu/ge/dreamclock/activity/FriendListActivity$Holder.class
	bin/classes/cn/jlu/ge/dreamclock/activity/PositiveEnergyActivity$Holder.class
	bin/dexedLibs/android-async-http-1.4.3-30267fdba1e4209b62ba97ecf42cf368.jar
	bin/dexedLibs/android-support-v4-36019d828f9fbb00fc0991b38305a663.jar
	bin/dexedLibs/android-support-v4-d29e454c0bd13d126bac8a39992edffe.jar
	bin/dexedLibs/library-84a334a5b2f7e9aa79dd9bfb0f1e8180.jar