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