summaryrefslogtreecommitdiff
path: root/docs/TODO
diff options
context:
space:
mode:
authormannol <eniz_vukovic@hotmail.com>2014-07-21 04:10:05 +0200
committermannol <eniz_vukovic@hotmail.com>2014-07-21 04:10:05 +0200
commit79115259a81dc958041f18573f34299c083cebea (patch)
tree594fbf60dc01e2aa78c775c4e2d9977c5b18752f /docs/TODO
parent2ca2baf120c5dd4dcdd9c450ef35560b0726136f (diff)
parentb63e4ad88fb93820fb740372f36d74c65b8b7b81 (diff)
Fixed conflicts
Diffstat (limited to 'docs/TODO')
-rw-r--r--docs/TODO2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/TODO b/docs/TODO
index 966a1b5f..dea513b2 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -52,7 +52,7 @@ blocks UDP (or is just unpunchable) (docs/TCP_Network.txt)
52See: (https://github.com/jencka/ProjectTox-libtoxdata) 52See: (https://github.com/jencka/ProjectTox-libtoxdata)
53 53
54[IN PROGRESS] GUI (no official one chosen yet, a list of promising ones follows) 54[IN PROGRESS] GUI (no official one chosen yet, a list of promising ones follows)
55https://github.com/notsecure/wintox 55https://github.com/notsecure/uTox
56https://github.com/naxuroqa/Venom 56https://github.com/naxuroqa/Venom
57https://github.com/Impyy/Toxy 57https://github.com/Impyy/Toxy
58https://github.com/lehitoskin/blight 58https://github.com/lehitoskin/blight