From: Luke Owncloud <owncloud@ohrt.org>
Date: Tue, 6 Aug 2013 09:27:07 +0000 (+0200)
Subject: mc
X-Git-Tag: oc-android-1.4.6~12^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c93b552db515c52afd92a6b4cc3a124b0dc30300?hp=--cc

mc
---

c93b552db515c52afd92a6b4cc3a124b0dc30300
diff --git a/.gitignore b/.gitignore
index 63b41a52..7a3b8360 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,4 @@ target/
 local.properties
 
 # Mac .DS_Store files
-.DS_Store
\ No newline at end of file
+.DS_Store
diff --git a/SETUP.md b/SETUP.md
index 692c8c46..ca7a25ab 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -15,7 +15,7 @@
   
   3. Building with eclipse:
 
-  -  TODO: FIX
+  -  TODO: FIX / MORE DETAILS
   -  Run "ant clean debug"
   -  Open Eclipse and import *actionbarsherlock/library* project to your workspace
   -  NOTE: You must have 'tools' and 'platforms-tools' in your path in order to run setup_env.sh
@@ -25,7 +25,7 @@
   
   -  Commit your changes locally: "git commit -a"
   -  Push your changes to your Github repo: "git push"
-  -  Browse to https://github.com/YOURGITHUBNAME/android/pulls
+  -  Browse to https://github.com/YOURGITHUBNAME/android/pulls and issue pull request
   -  Click "Edit" and set "base:develop"
   -  Again, click "Edit" and set "compare:develop"
   -  Enter description and send pull request.
diff --git a/setup_env.bat b/setup_env.bat
index c13edca2..3f03856e 100644
--- a/setup_env.bat
+++ b/setup_env.bat
@@ -5,4 +5,4 @@ call android.bat update project -p . --target 1
 copy /Y third_party\android-support-library\android-support-v4.jar actionbarsherlock\library\libs\android-support-v4.jar
 cd tests
 android.bat update test-project -m .. -p .
-cd ..
\ No newline at end of file
+cd ..