Age | Commit message (Collapse) | Author | |
---|---|---|---|
2013-09-12 | Merge remote-tracking branch 'upstream/master' into Integration | Coren[m] | |
Conflicts resolved: toxcore/Messenger.c toxcore/network.h | |||
2013-09-11 | Integration of group chats into messenger in progress. | irungentoo | |
2013-09-11 | Some small work on group chats done. | irungentoo | |
2013-09-11 | Merge remote-tracking branch 'upstream/master' into Integration | Coren[m] | |
2013-09-10 | Fixed building with NaCl. | irungentoo | |
2013-09-10 | big push, putting all the infrastructure in place behind TOX_ENABLE_IPV6 | Coren[m] | |
2013-09-09 | group_chats.c: | Coren[m] | |
- *->net->sock to *->net (like everywhere else :)) | |||
2013-09-09 | move group chats to /toxcore | irungentoo | |