summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2015-10-19 17:32:52 -0400
committerirungentoo <irungentoo@gmail.com>2015-10-19 17:32:52 -0400
commit5300f621254e75d6d506fc24496ef3cdfa7143c6 (patch)
tree655c20aa6df8de2f8e6dcfe72a7b275c4c7035fa
parentb1abbbd953b5ab1bd8567ab70ffe426d27f26048 (diff)
parentb5c1b87e3588be85ef9093cc0ecf688f1691b26e (diff)
Merge branch 'master' of https://github.com/JacobHenner/toxcore
-rw-r--r--README.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/README.md b/README.md
index 4d08dcda..ed62a9b2 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,11 @@
1![Project Tox](https://raw.github.com/irungentoo/toxcore/master/other/tox.png "Project Tox") 1![Project Tox](https://raw.github.com/irungentoo/toxcore/master/other/tox.png "Project Tox")
2*** 2***
3 3
4With the rise of governmental monitoring programs, Tox, a FOSS initiative, aims to be an easy to use, all-in-one communication platform that ensures their users full privacy and secure message delivery.<br /> <br /> 4With the rise of government surveillance programs, Tox, a FOSS initiative, aims to be an easy to use, all-in-one communication platform that ensures full privacy and secure message delivery.<br /> <br />
5 5
6[**Website**](https://tox.chat) **|** [**Wiki**](https://wiki.tox.chat/) **|** [**Blog**](https://blog.tox.chat/) **|** [**FAQ**](https://wiki.tox.chat/doku.php?id=users:faq) **|** [**Binaries/Downloads**](https://wiki.tox.chat/Binaries) **|** [**Clients**](https://wiki.tox.chat/doku.php?id=clients) **|** [**Compiling**](/INSTALL.md) **|** **IRC Channel:** [#tox@freenode](https://webchat.freenode.net/?channels=tox) 6[**Website**](https://tox.chat) **|** [**Wiki**](https://wiki.tox.chat/) **|** [**Blog**](https://blog.tox.chat/) **|** [**FAQ**](https://wiki.tox.chat/doku.php?id=users:faq) **|** [**Binaries/Downloads**](https://wiki.tox.chat/Binaries) **|** [**Clients**](https://wiki.tox.chat/doku.php?id=clients) **|** [**Compiling**](/INSTALL.md)
7
8**IRC Channels:** [#tox@freenode](https://webchat.freenode.net/?channels=tox), [#tox-dev@freenode](https://webchat.freenode.net/?channels=tox-dev)
7 9
8 10
9## The Complex Stuff: 11## The Complex Stuff:
@@ -36,4 +38,3 @@ The goal of this project is to create a configuration-free P2P Skype replacement
36- [Compiling](/INSTALL.md) 38- [Compiling](/INSTALL.md)
37- [DHT Protocol](/docs/updates/DHT.md)<br /> 39- [DHT Protocol](/docs/updates/DHT.md)<br />
38- [Crypto](/docs/updates/Crypto.md)<br /> 40- [Crypto](/docs/updates/Crypto.md)<br />
39