diff options
| author | pranomostro <pranomestro@gmail.com> | 2017-03-03 15:39:30 +0100 |
|---|---|---|
| committer | pranomostro <pranomestro@gmail.com> | 2017-03-03 15:41:21 +0100 |
| commit | d10df26852b6db53156e1f892e29239435c66299 (patch) | |
| tree | 73ab6b3b7df46f08d0fb3eae4ec17a3164e9690b /Makefile | |
| parent | 799e250bbc9cf89bb09b7cfa4afbc4dbb9a46657 (diff) | |
| parent | e8f046c0e616a7a0b10d1bb85abe887c1a374179 (diff) | |
Merge branch 'toktok'.
This merge updates ratox to toktoks toxcore, which is being developed, and
adds groupchats (although lacking audio group chats at the moment).
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions