Resolved conflicts when merging upstream

1 files changed, 2 insertions, 2 deletions

diff --git a/docs/TODO b/docs/TODO
index fc50d566..966a1b5f 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -24,8 +24,8 @@ Lossless UDP:
     [DONE] Call initiation
     [DONE] Encryption
     [IN PROGRESS] Auditing.
-    [NOT STARTED] Video packet splitting.
-    [NOT STARTED] Prevent audio skew.
+    [NEEDS TESTING] Video packet splitting.
+    [IN PROGRESS] Prevent audio skew (seems to be easily solvable client side.)
     [IN PROGRESS] Group chats.
 
 Friend_requests.c: