From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 15 Sep 2015 16:45:14 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/owncloud/android into material_fab
X-Git-Tag: beta-20151202~3^2~45
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6ed679cc3f7402457a4b9618b43545c3c4bb7f82?hp=-c

Merge branch 'master' of https://github.com/owncloud/android into material_fab
---

6ed679cc3f7402457a4b9618b43545c3c4bb7f82
diff --combined SETUP.md
index 469a3312,0f1bc8ed..64c04c97
--- a/SETUP.md
+++ b/SETUP.md
@@@ -36,7 -36,7 +36,7 @@@ Next steps will assume you have a Githu
  * Open a terminal and go on with the next steps in it.
  * Clone your forked repository: ```git clone git@github.com:YOURGITHUBNAME/android.git```.
  * Move to the project folder with ```cd android```.
- * Checkout the remote branch 'master' in your own local branch 'master': ```git checkout -b master remotes/origin/master```.
+ * Checkout the remote branch 'master' in your own local branch 'master': ```git checkout master remotes/origin/master```.
  * Pull any changes from your remote branch 'master': ```git pull origin master```
  * Make official ownCloud repo known as upstream: ```git remote add upstream git@github.com:owncloud/android.git```
  * Make sure to get the latest changes from official android/master branch: ```git pull upstream master```
@@@ -90,7 -90,6 +90,7 @@@ The generated APK file is saved in andr
  * Choose the projects with the next names under the 'New Project Name' column:
  ** owncloud-android 
  ** android-support-appcompat-v7-exploded-aar
 +** com-getbase-floatingactionbutton-1-10-0-exploded-aar
  ** owncloud-android-workaround-accounts	(optional)
  ** ownCloud Android Library
  ** ownCloud Sample Client (optional)
@@@ -103,12 -102,11 +103,12 @@@
  * If any error persists, clean and build manually the next projects in order:
  ** ownCloud Android Library
  ** android-support-appcompat-v7-exploded-aar
 +** com-getbase-floatingactionbutton-1-10-0-exploded-aar
  ** owncloud-android
  * If any error on those projects persists, check the project properties. In the 'Android' section, API Level should be
  ** ownCloud Android Library	-> API level 19
  ** android-support-appcompat-v7-exploded-aa -> API level 22
 -** owncloud-android	-> API level 22 ; in this project, two library projects should appear referred in the bottom of the dialog: libs\android-support-appcompat-v7-exploded-aar and owncloud-android-library. Add them if needed.
 +** owncloud-android	-> API level 22 ; in this project, three library projects should appear referred in the bottom of the dialog: libs\android-support-appcompat-v7-exploded-aar, ** com-getbase-floatingactionbutton-1-10-0-exploded-aar and owncloud-android-library. Add them if needed.
  * After those actions you should be good to go. HAVE FUN!