summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-08-09Merge pull request #409 from lukechampine/betterpromptirungentoo
2013-08-09Merge pull request #411 from slvr/masterirungentoo
2013-08-09Merge pull request #410 from KostyaKow/arrayirungentoo
2013-08-09Merge commit '4b217bca97' into HEADslvr
2013-08-09Added headers to fix build errors.Konstantin Kowalski
2013-08-09Macports support (OS X only). MAP_ANON -> MAP_ANONYMOUS (OS X only).slvr
2013-08-09Macports support (OS X only). MAP_ANON -> MAP_ANONYMOUS (OS X only).slvr
2013-08-09Minor style changes.Konstantin Kowalski
2013-08-09Moved long comments to wiki.Konstantin Kowalski
2013-08-09Added arrays.Konstantin Kowalski
2013-08-09Added INFO() debugging macro.Konstantin Kowalski
2013-08-09make toxic handle input in a more sane mannerLuke Champine
2013-08-09Merge pull request #407 from JFreegman/masterirungentoo
2013-08-09Merge pull request #408 from cbrueffer/receivedfixirungentoo
2013-08-09Fix a recurring typo in code and comments.Christian Brueffer
2013-08-09fixed chat window text wrappingJfreegman
2013-08-08Merge pull request #404 from KostyaKow/small_fixesirungentoo
2013-08-09Fixed a printf argument.Konstantin Kowalski
2013-08-08added -n argument to toxic to disable loading keys from file (for testing)irungentoo
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