Merge remote-tracking branch 'upstream/master' into Integration

author: Coren[m] <Break@Ocean> 2013-09-10 20:57:10 +0200
committer: Coren[m] <Break@Ocean> 2013-09-10 20:57:10 +0200
commit: 5ed6fd04be4e2da3630497687814d4bb3e7dbf2d (patch)
tree: 6c5d268c55a85f7b279deb6ea2e6ca796ed179c9 /docs
parent: 3ae7460853b6777e18f213b316d43cef6c5a603e (diff)
parent: 9e80dd71ca5bc86c9189f35d3d3e5663da2ddd4e (diff)
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/TODO b/docs/TODO
index 0db9a341..49b06690 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -21,3 +21,6 @@ Lossless UDP:
 [NOT STARTED] Offline messaging
 [NOT STARTED] Friends list syncing
+[IN PROGRESS] IPV6 support
+[IN PROGRESS] GUI (https://github.com/nurupo/ProjectTox-Qt-GUI)
+[NOT STARTED] Security audit from professionals
author	Coren[m] <Break@Ocean>	2013-09-10 20:57:10 +0200
committer	Coren[m] <Break@Ocean>	2013-09-10 20:57:10 +0200
commit	5ed6fd04be4e2da3630497687814d4bb3e7dbf2d (patch)
tree	6c5d268c55a85f7b279deb6ea2e6ca796ed179c9 /docs
parent	3ae7460853b6777e18f213b316d43cef6c5a603e (diff)
parent	9e80dd71ca5bc86c9189f35d3d3e5663da2ddd4e (diff)

diff --git a/docs/TODO b/docs/TODO index 0db9a341..49b06690 100644 --- a/docs/TODO +++ b/docs/TODO
@@ -21,3 +21,6 @@ Lossless UDP:
21		21
22	[NOT STARTED] Offline messaging	22	[NOT STARTED] Offline messaging
23	[NOT STARTED] Friends list syncing	23	[NOT STARTED] Friends list syncing
		24	[IN PROGRESS] IPV6 support
		25	[IN PROGRESS] GUI (https://github.com/nurupo/ProjectTox-Qt-GUI)
		26	[NOT STARTED] Security audit from professionals