Go to file

kehaoyuan deee22b6db Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	app/src/main/java/com/gh/gamecenter/CleanApkActivity.java
#	app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
#	app/src/main/java/com/gh/gamecenter/VoteActivity.java
#	app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java
#	app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
#	app/src/main/java/com/gh/gamecenter/adapter/VoteAdapter.java
#	app/src/main/java/com/gh/gamecenter/libao/Libao1FragmentAdapter.java
#	app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java
#	app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java
#	app/src/main/java/com/gh/gamecenter/message/CommentFragmentAdapter.java
#	app/src/main/java/com/gh/gamecenter/news/News1FragmentAdapter.java

2017-05-03 16:32:10 +08:00

app

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

2017-05-03 16:32:10 +08:00

gradle/wrapper

fix gradle version

2017-04-21 17:45:13 +08:00

libraries

1、所有引用整理到从dependencies.gradle文件，部分库做了升级

2017-04-27 14:15:05 +08:00

scripts

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