diff options
author | Scott Jackson <daneren2005@gmail.com> | 2015-06-09 17:46:37 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2015-06-09 17:46:37 -0700 |
commit | 9d4876f4874d034177c4f012932ca936d85e40ac (patch) | |
tree | 05a4db08bf5f8471d42dd2a1a8ba352d16b447b7 /app/build.gradle | |
parent | 6caaca0cecd9f4f60f695a68c72eb662b4a45b34 (diff) | |
parent | 9f8e9b89bb2d564bcaf00309b38ed9c4d970aeb9 (diff) | |
download | dsub-9d4876f4874d034177c4f012932ca936d85e40ac.tar.gz dsub-9d4876f4874d034177c4f012932ca936d85e40ac.tar.bz2 dsub-9d4876f4874d034177c4f012932ca936d85e40ac.zip |
Merge branch 'SlideUpPanel2' into NavigationView
Conflicts:
app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
Diffstat (limited to 'app/build.gradle')
-rw-r--r-- | app/build.gradle | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/build.gradle b/app/build.gradle index be66c701..cdc1152b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,7 +26,6 @@ android { } dependencies { - compile project(':DragSort ListView') compile project(':Server Proxy') compile fileTree(include: ['*.jar'], dir: 'libs') compile 'com.android.support:support-v4:22.2.+' |