diff options
| author | mannol <eniz_vukovic@hotmail.com> | 2014-07-21 04:10:05 +0200 |
|---|---|---|
| committer | mannol <eniz_vukovic@hotmail.com> | 2014-07-21 04:10:05 +0200 |
| commit | 79115259a81dc958041f18573f34299c083cebea (patch) | |
| tree | 594fbf60dc01e2aa78c775c4e2d9977c5b18752f /docs | |
| parent | 2ca2baf120c5dd4dcdd9c450ef35560b0726136f (diff) | |
| parent | b63e4ad88fb93820fb740372f36d74c65b8b7b81 (diff) | |
Fixed conflicts
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/TODO | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -52,7 +52,7 @@ blocks UDP (or is just unpunchable) (docs/TCP_Network.txt) | |||
| 52 | See: (https://github.com/jencka/ProjectTox-libtoxdata) | 52 | See: (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) |
| 55 | https://github.com/notsecure/wintox | 55 | https://github.com/notsecure/uTox |
| 56 | https://github.com/naxuroqa/Venom | 56 | https://github.com/naxuroqa/Venom |
| 57 | https://github.com/Impyy/Toxy | 57 | https://github.com/Impyy/Toxy |
| 58 | https://github.com/lehitoskin/blight | 58 | https://github.com/lehitoskin/blight |