khy d9ea9cf1ba Merge remote-tracking branch 'origin/2.0' into 2.0 ...

# Conflicts:
#	app/src/main/res/drawable-hdpi/home1_selected.png
#	app/src/main/res/drawable-hdpi/home1_unselected.png
#	app/src/main/res/drawable-hdpi/home2_selected.png
#	app/src/main/res/drawable-hdpi/home2_unselected.png
#	app/src/main/res/drawable-hdpi/home3_selected.png
#	app/src/main/res/drawable-hdpi/home3_unselected.png
#	app/src/main/res/drawable/oval_hint_dn.xml
#	app/src/main/res/drawable/oval_hint_up.xml
#	app/src/main/res/layout/activity_main.xml

2016-09-08 16:46:13 +08:00

..

base

Merge branch '2.0' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.0

2016-09-06 18:21:13 +08:00

common

Merge remote-tracking branch 'origin/2.0' into 2.0

2016-09-08 16:46:13 +08:00

download

解决final int position导致的bug

2016-09-07 18:52:21 +08:00

gamecenter

Merge remote-tracking branch 'origin/2.0' into 2.0

2016-09-08 16:46:13 +08:00