summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-08-13Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JF...irungentoo
2013-08-13Merge pull request #441 from slvr/timerirungentoo
2013-08-13Merge pull request #447 from gladiac/fixesirungentoo
2013-08-13Merge pull request #445 from ReAzem/patch-1irungentoo
2013-08-13Portabily print out uint64_t using PRIu64slvr
2013-08-13Removed core/Messenger.c.origslvr
2013-08-13timer_new -> new_timer and timer_delete -> delete_timer to avoid name conflictslvr
2013-08-13core: Fix a possible buffer overflow using getself_name().Andreas Schneider
2013-08-13toxic: Fix get_user_config_dir().Andreas Schneider
2013-08-12unresolved addresses fail silentlyJfreegman
2013-08-12auto-connect errors verboseJfreegman
2013-08-12Update README.mdAlexandre Viau
2013-08-12put a bunch of repeated code into a function and added timestamps to status/n...Jfreegman
2013-08-12minor improvements and bug fixesJfreegman
2013-08-12Resolve Merge Conflictslvr
2013-08-12Merge remote-tracking branch 'upstream/master' into timerslvr
2013-08-12Merge pull request #439 from Alek900/masterirungentoo
2013-08-12Merge pull request #437 from JFreegman/masterirungentoo
2013-08-12remember to call timer_pollslvr
2013-08-12Messenger Timerslvr
2013-08-12Added LAN discovery timerslvr
2013-08-12Added support for userdata in callbacksalek900
2013-08-12Implemented Deadline Timer and timer_testslvr
2013-08-12Merge pull request #438 from mkfifo/masterirungentoo
2013-08-12a little overkillJfreegman
2013-08-12Messenger refactor - redid work from pull request 79Chris Hall
2013-08-12make connection more robustJfreegman
2013-08-11Merge pull request #436 from Alek900/masterirungentoo
2013-08-11Send our current status and name to friend that just came online.alek900
2013-08-11Merge pull request #435 from nurupo/masterirungentoo
2013-08-11Fixed a mistakeMaxim Biro
2013-08-11Fixed a typoMaxim Biro
2013-08-11Merge pull request #434 from nurupo/masterirungentoo
2013-08-11Replaced friendstatus with connectionstatusMaxim Biro
2013-08-11Merge pull request #433 from nurupo/masterirungentoo
2013-08-11Fixed warnings on WindowsMaxim Biro
2013-08-11Merge pull request #432 from stal888/patch-2irungentoo
2013-08-11How did I manage to fuck this up?stal
2013-08-11Update readme to reflect site repo movestal
2013-08-11Merge pull request #431 from leeroy2098/mergeirungentoo
2013-08-11Fix a possible memory leakSimon Levermann
2013-08-11Merge pull request #423 from JFreegman/masterirungentoo
2013-08-11Merge pull request #429 from dparnell/pristineirungentoo
2013-08-11Merge pull request #427 from Alek900/masterirungentoo
2013-08-11Fixed m_sendmessage to return the ID of the message sentDaniel Parnell
2013-08-11m_addfriend triggerd m_callback_friendstatus with a friendid thats not return...alek900
2013-08-11potential seg faultJfreegman
2013-08-10Merge pull request #425 from lukechampine/betterpromptirungentoo
2013-08-10make argument handling (esp. of strings) more robustlukechampine
2013-08-10Merge pull request #422 from slvr/crypto-speed-boostirungentoo