summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2013-08-05Merge pull request #348 from stqism/masterirungentoo
Throws in a bell when a message is recieved, to warn to user
2013-08-05Update install.rstvolgafan
sudo should be used instead bash
2013-08-05Merge branch 'master' of https://github.com/plutooo/ProjectTox-Core into ↵irungentoo
plutooo-master
2013-08-05Throws in a bell when a message is recieved, to warn to userSean Qureshi
2013-08-05spacing didn't match outgoing msgsJfreegman
2013-08-05bug fix and added wrapping on friends listJfreegman
2013-08-05Merge pull request #347 from nickodell/masterirungentoo
Fix bug where handle_NATping wouldn't perform bounds checking
2013-08-05Fix bug where friendreq_handlepacket did not do bounds checkingNick ODell
2013-08-05Fix bug where handle_NATping wouldn't perform bounds checkingNick ODell
2013-08-05list commands on chat window popupJfreegman
2013-08-05Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Corecharmlesscoin
2013-08-05chat window deleting and re-adding - it just werksJfreegman
2013-08-05core: Rewrote ping-module, better performance and cleaner code.plutooo
2013-08-05Make test clients compatible with userstatus kindsSebastian Stal
No features were added, just fixed callbacks.
2013-08-05Add functions for dealing with userstatus kinds.Sebastian Stal
2013-08-05Merge pull request #339 from Nominate/patch-3irungentoo
Grammar/aesthetic amendment
2013-08-05Grammar/aesthetic amendmentNominate
2013-08-05Merge pull request #338 from Nominate/patch-1irungentoo
Added a 'clear' function to the prompt
2013-08-05Merge remote-tracking branch 'upstream/master' into testingJfreegman
2013-08-05Added a 'clear' function to the promptNominate
2013-08-05Fixed toxic friends list flickerjoshuaj
2013-08-05Merge pull request #334 from lukechampine/masterirungentoo
temporary fix to prevent m_addfriend from segfaulting
2013-08-05temporary fix to prevent m_addfriend from segfaultingLuke Champine
2013-08-05Merge pull request #312 from Niautanor/masterirungentoo
fix for Issue #288
2013-08-05Merge pull request #333 from fhahn/void-parametersirungentoo
Use void for functions with no parameters
2013-08-05Use void for functions with no parametersFlorian Hahn
2013-08-05init arrayJfreegman
2013-08-05Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into ↵Jfreegman
testing
2013-08-05testJfreegman