diff options
| author | mannol <eniz_vukovic@hotmail.com> | 2014-07-03 17:08:38 +0200 |
|---|---|---|
| committer | mannol <eniz_vukovic@hotmail.com> | 2014-07-03 17:08:38 +0200 |
| commit | f8a2a865dc32bfa626cc150a509d30d897e1181b (patch) | |
| tree | 5bb6b234149cdf2a79422815dc59a0c53cb3cb0e /docs/TODO | |
| parent | a9a7f6a5952d0385904ec9df078ac065a3f5887f (diff) | |
| parent | c4f0650ae33e1669bfc994ef4f76c6c31e4d63c0 (diff) | |
Resolved conflicts when merging upstream
Diffstat (limited to 'docs/TODO')
| -rw-r--r-- | docs/TODO | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -24,8 +24,8 @@ Lossless UDP: | |||
| 24 | [DONE] Call initiation | 24 | [DONE] Call initiation |
| 25 | [DONE] Encryption | 25 | [DONE] Encryption |
| 26 | [IN PROGRESS] Auditing. | 26 | [IN PROGRESS] Auditing. |
| 27 | [NOT STARTED] Video packet splitting. | 27 | [NEEDS TESTING] Video packet splitting. |
| 28 | [NOT STARTED] Prevent audio skew. | 28 | [IN PROGRESS] Prevent audio skew (seems to be easily solvable client side.) |
| 29 | [IN PROGRESS] Group chats. | 29 | [IN PROGRESS] Group chats. |
| 30 | 30 | ||
| 31 | Friend_requests.c: | 31 | Friend_requests.c: |