summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2013-08-10That define doesn't belong here.irungentoo
2013-08-10was making the ID change on every startupJfreegman
2013-08-10Merge pull request #415 from slvr/prirungentoo
2013-08-10fix memory leakJfreegman
2013-08-10don't need thatJfreegman
2013-08-10auto-connect to DHT on startupJfreegman
2013-08-10handle_ping_response function signature correctionslvr
2013-08-10Merge remote-tracking branch 'upstream/master' into prslvr
2013-08-10Ensure encrypt_precompute is called when status == CONN_ESTABLISHEDslvr
2013-08-10Added crypto_speed_testslvr
2013-08-10Implemented encrypt_data_fast, decrypt_data_fast and crypto testsslvr
2013-08-10tabs -> spacesslvr
2013-08-10networking_poll: receivepacket(&ip_port, data, &length) == -1slvr
2013-08-09Fixed possible bug.irungentoo