summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-08-08Merge pull request #403 from jin-eld/fix-friend-status-callbackirungentoo
2013-08-08Merge pull request #402 from Astonex/patch-5irungentoo
2013-08-09Fix typo in function name which results in missing symboljin-eld
2013-08-08Update CMakeLists.txtAstonex
2013-08-08Merge pull request #400 from JFreegman/masterirungentoo
2013-08-08Merge pull request #399 from ReAzem/patch-1irungentoo
2013-08-08added /me actions to toxicJfreegman
2013-08-08added actions/alternate messagesJfreegman
2013-08-08Update .gitignoreAlexandre Viau
2013-08-08Merge pull request #398 from Astonex/patch-4irungentoo
2013-08-08Update nTox_win32.cAstonex
2013-08-08Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere into...irungentoo
2013-08-08Merge pull request #397 from leeroy2098/mergeirungentoo
2013-08-08Made name consistent with other 'on change' callbacksMaxim Biro
2013-08-08Fixed a silly code ordering mistakeMaxim Biro
2013-08-08Fixed dynamic memory allocation.irungentoo
2013-08-08Merge branch 'upstream'Simon Levermann
2013-08-08Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into u...Simon Levermann
2013-08-08Merge pull request #396 from lukechampine/dynamicfriendsirungentoo
2013-08-08Merge pull request #395 from fhahn/ctestirungentoo
2013-08-08Merge pull request #394 from Nominate/patch-2irungentoo
2013-08-08Merge pull request #393 from Nominate/patch-1irungentoo
2013-08-08Moved a define and fixed another.irungentoo
2013-08-08make friendlist resize dynamicallyLuke Champine
2013-08-08Cleanup and Error fixesSimon Levermann
2013-08-08Implement proper config directories.Simon Levermann
2013-08-08Merge pull request #388 from stal888/patch-1irungentoo
2013-08-08Merge pull request #384 from stqism/masterirungentoo
2013-08-08Merge pull request #391 from JFreegman/masterirungentoo
2013-08-08Merge pull request #392 from panosalbanis/masterirungentoo
2013-08-08Run unit tests with travisFlorian Hahn
2013-08-08Disable failing test assertionFlorian Hahn
2013-08-08Use ctest to run unit testsFlorian Hahn
2013-08-08Updated chat.c to bring /status inline with prompt.c status commandNominate
2013-08-08Removed superfluous statusmsgNominate
2013-08-08Merge https://github.com/irungentoo/ProjectTox-CoreSean Qureshi
2013-08-08Merged upstream main.c changesSean Qureshi
2013-08-08Added Vim swap files and ctags filepanosalbanis
2013-08-08oopsJfreegman
2013-08-08fix magic numbersJfreegman
2013-08-08Attempt to get and create a proper directory for config storage.Simon Levermann
2013-08-08Made a callback for Friend.status changeMaxim Biro
2013-08-07Reinstate semicolonstal
2013-08-07Re-export m_callback_userstatusstal
2013-08-07Merge pull request #382 from nurupo/masterirungentoo
2013-08-07Adds full -D support to toxics versioning, includes the commit numberSean Qureshi
2013-08-07Fixed auto testsMaxim Biro
2013-08-07Merge branch 'master' of https://github.com/irungentoo/ProjectTox-CoreMaxim Biro
2013-08-07Merge pull request #383 from stqism/masterirungentoo
2013-08-07Refactored an expressionMaxim Biro