sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #614 from SamWhited/spacefixes 

Fix some space/tab issues in README
This commit is contained in:
Daniel Gultsch 2014-11-03 20:30:52 +01:00
parent c48407f3b4 515f2f379f
commit 962008fec8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
README.md
View File

@ -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: 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 * 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-0138: Stream Compression saves bandwidth
* XEP-0163: Personal Eventing Protocol for avatars * XEP-0163: Personal Eventing Protocol for avatars
* XEP-0198: Stream Management allows XMPP to survive small network outages and * XEP-0198: Stream Management allows XMPP to survive small network outages and
@ -271,7 +271,7 @@ Make sure to have ANDROID_HOME point to your Android SDK
git clone https://github.com/siacs/Conversations.git git clone https://github.com/siacs/Conversations.git
cd Conversations cd Conversations
./gradlew build ./gradlew build
### How do I update/add external libraries? ### How do I update/add external libraries?
@ -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): following (using `minidns` as an example):
git remote add minidns https://github.com/rtreffer/minidns.git git remote add minidns https://github.com/rtreffer/minidns.git
git fetch minidns git fetch minidns
git merge -s subtree minidns master git merge -s subtree minidns master
To add a new dependency to the `libs/` directory (replacing "name", "branch" and To add a new dependency to the `libs/` directory (replacing "name", "branch" and
"url" as necessary): "url" as necessary):
git remote add name url git remote add name url
git merge -s ours --no-commit name/branch git merge -s ours --no-commit name/branch
git read-tree --prefix=libs/name -u name/branch git read-tree --prefix=libs/name -u name/branch
git commit -m "Subtree merged in name" git commit -m "Subtree merged in name"
#### How do I debug Conversations #### How do I debug Conversations