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

Conflicts:
	app/src/main/java/com/gh/gamecenter/MainActivity.java

2017-04-26 15:59:44 +08:00

..

src

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

2017-04-26 15:59:44 +08:00

build.gradle

1、systembar tint/switchbutton/mipush做了更新整理

2017-04-25 18:45:10 +08:00

gh.keystore

统一暂停，继续下载处理

2016-05-20 16:35:11 +08:00

proguard-fresco.txt

1、systembar tint/switchbutton/mipush做了更新整理

2017-04-25 18:45:10 +08:00

proguard-rules.txt

1、systembar tint/switchbutton/mipush做了更新整理

2017-04-25 18:45:10 +08:00

sign.properties

整理工程结构，library配置未完全抽离出来

2017-04-21 16:59:29 +08:00