From f3401ab64f38754772b9c9c69485a6cc49af44b5 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Mon, 3 Nov 2014 08:06:32 -0500 Subject: [PATCH 1/3] Fix some space/tab issues in README --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ed8a48af..9dd4b378 100644 --- a/README.md +++ b/README.md @@ -281,16 +281,16 @@ in the `libs/` directory, you can update it using a subtree merge by doing the following (using `minidns` as an example): git remote add minidns https://github.com/rtreffer/minidns.git - git fetch minidns - git merge -s subtree minidns master + git fetch minidns + git merge -s subtree minidns master To add a new dependency to the `libs/` directory (replacing "name", "branch" and "url" as necessary): git remote add name url - git merge -s ours --no-commit name/branch - git read-tree --prefix=libs/name -u name/branch - git commit -m "Subtree merged in name" + git merge -s ours --no-commit name/branch + git read-tree --prefix=libs/name -u name/branch + git commit -m "Subtree merged in name" #### How do I debug Conversations From 61466f352fcd53a408a4f1a8e2fbcae167faf286 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Mon, 3 Nov 2014 08:07:59 -0500 Subject: [PATCH 2/3] Another tab fix. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9dd4b378..dd4bce04 100644 --- a/README.md +++ b/README.md @@ -271,7 +271,7 @@ Make sure to have ANDROID_HOME point to your Android SDK git clone https://github.com/siacs/Conversations.git cd Conversations - ./gradlew build + ./gradlew build ### How do I update/add external libraries? From 515f2f379f2270b45472fcbf10b59db07bfb9bcc Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Mon, 3 Nov 2014 08:08:51 -0500 Subject: [PATCH 3/3] Removed the last \t from the README... --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dd4bce04..63f9ce50 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ should consider either switching to an XMPP server that does or — even better run your own XMPP server for you and your friends. These XEP's are: * XEP-0065: SOCKS5 Bytestreams (or mod_proxy65). Will be used to transfer - files if both parties are behind a firewall (NAT). + files if both parties are behind a firewall (NAT). * XEP-0138: Stream Compression saves bandwidth * XEP-0163: Personal Eventing Protocol for avatars * XEP-0198: Stream Management allows XMPP to survive small network outages and