summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-07Manually merged my earlier commits with upstreamSean Qureshi
2013-08-07forgot thisJfreegman
2013-08-07Fixed two bugsJfreegman
2013-08-07testing/toxic/prompt.c: changed execute() to ignore whitespace at end of ↵ptrasd
commands
2013-08-07testing/toxic/prompt.c: changed execute() to skip whitespace at start of commandptrasd
2013-08-07added files for unit testscharmlesscoin
2013-08-06Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Corecharmlesscoin
2013-08-06Merge pull request #366 from nickodell/masterirungentoo
Misc bugfixes
2013-08-06Merge remote-tracking branch 'upstream/master'Nick ODell
2013-08-06Fix bug where file handle wasn't closed on successNick ODell
2013-08-06Fix segfault when no broadcast device is foundNick ODell
2013-08-06Fix bug where we could run past the end of the friends listNick ODell
2013-08-06Added ERROR() and WARNING() for debugging.Konstantin Kowalski
2013-08-06Added a linked list implementation.Konstantin Kowalski
2013-08-06Merge pull request #363 from JFreegman/masterirungentoo
code format/clean up
2013-08-06code format/clean upJfreegman
2013-08-06Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Coreirungentoo
2013-08-06Small bug fixed.irungentoo
2013-08-06Merge pull request #362 from KostyaKow/masterirungentoo
Added linked list and stuff for debugging.
2013-08-06Added ERROR() and WARNING() for debugging.Konstantin Kowalski
2013-08-06Merge pull request #361 from plutooo/masterirungentoo
core: Moved handle ping packets to ping.c
2013-08-06core: Moved handle ping packets to ping.cplutooo
2013-08-06fixed print_statuschange & m_set_userstatus usage in nTox_win32.cDarkSER
2013-08-06Merge branch 'master' of https://github.com/plutooo/ProjectTox-Core into ↵irungentoo
plutooo-master Conflicts: core/ping.c core/util.c
2013-08-06Added a linked list implementation.Konstantin Kowalski
2013-08-06core: Move ping request/response into ping.cplutooo
2013-08-06Merge branch 'dev'plutooo
Conflicts: core/packets.h core/ping.c
2013-08-06core: Move send ping packets functions to ping.cplutooo
2013-08-06core: Move send ping packets functions to ping.cplutooo
2013-08-06Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into ↵irungentoo
JFreegman-master Conflicts: testing/toxic/prompt.c
2013-08-06Merge pull request #354 from Nominate/patch-4irungentoo
Stops line-spamming and clears before printing help
2013-08-06Fixed formattingNominate
2013-08-06Update prompt.cNominate
2013-08-06Corrected wrap-aroundNominate
This should allow wrap-around and allow proper execution.
2013-08-06Stops line-spamming and clears before printing helpNominate
This addresses one issue in #340 perfectly and slightly improves the other.
2013-08-05Merge pull request #353 from cjsthompson/masterirungentoo
On UNIX, if pkg-config is available, use it to find the location of libconfig's headers.
2013-08-06On UNIX, if pkg-config is available, use it to find the location ofChristoph J. Thompson
libconfig's headers. modified: cmake/FindLIBCONFIG.cmake
2013-08-05Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Corecharmlesscoin
2013-08-05Merge pull request #352 from stqism/masterirungentoo
In odd cases a terminal may not support beep, added flash as well.
2013-08-05Merge branch 'master' of https://github.com/irungentoo/ProjectTox-CoreSean Qureshi
2013-08-05Added flash, apparently in weird cases it works when beep failsSean Qureshi
2013-08-05Merge pull request #351 from joshuaj/toxic_flicker_fixirungentoo
Fixed toxic friends list flicker
2013-08-05Merge branch 'plutooo-master'irungentoo
2013-08-05Fixed style and is_pinging().irungentoo
2013-08-05Merge pull request #350 from stqism/masterirungentoo
Removed a useless ! from toxics status
2013-08-05Merge pull request #341 from stal888/userstatus-extirungentoo
An extension to user statuses.
2013-08-05WindozeSebastian Stal
2013-08-05Merge branch 'master' of https://github.com/irungentoo/ProjectTox-CoreSean Qureshi
2013-08-05Removed a useless ! from toxics statusSean Qureshi
2013-08-05Merge pull request #349 from volgafan/patch-1irungentoo
Update install.rst