summaryrefslogtreecommitdiff
path: root/core
AgeCommit message (Collapse)Author
2013-08-01restored this branch to be on par with upstreamcharmlesscoin
2013-07-31corrected comment and removed forced message for friend addsJfreegman
2013-07-31Merge remote-tracking branch 'ProjectTox/master'Astonex
2013-07-31Slight changesAstonex
2013-07-31Merge branch 'master' of https://github.com/xzfc/ProjectTox-Core into ↵irungentoo
xzfc-master Conflicts: CMakeLists.txt
2013-07-31Merge pull request #171 from AMDmi3/freebsd-fixesirungentoo
FreeBSD fixes
2013-07-31NaCl compiling optionxzfcpw
2013-07-31Add detection of required librariesDmitry Marakasov
2013-07-30Small fixes.irungentoo
2013-07-31Update Messenger.cAstonex
Offer more meaningful returns so appropriate actions can be taken by the GUI.
2013-07-30Fixed segfault.irungentoo
2013-07-30Add missing newlines at EOF in sourcesDmitry Marakasov
(missing newlines break build due to -Werror)
2013-07-30Clarification.irungentoo
2013-07-30Merge branch 'master' of https://github.com/blackwolf12333/ProjectTox-Core ↵irungentoo
into blackwolf12333-master Also fixed his pull request.
2013-07-30renamed getname to getfriendname and added a getname function to get the ↵Peter Maatman
name of our client
2013-07-30Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere ↵irungentoo
into nurupo-master Conflicts: testing/CMakeLists.txt
2013-07-30Merge pull request #146 from boredomist/patch-1irungentoo
Replace magic value "7" with string "echo"
2013-07-30Fixed the friends listingAstonex
2013-07-29Replace magic value "7" with string "echo"Erik Price
2013-07-29Fixed function signatureMaxim Biro
2013-07-29Fixed formatting of some cmake filesMaxim Biro
2013-07-28Added basic dynamic memory allocation to Lossless UDP.irungentoo
2013-07-28Slightly improved hole punching in the DHT.irungentoo
2013-07-27Fixed name related functions.irungentoo
They now should give proper lengths and take length into account when sending.
2013-07-27Added friend request accepting to nTox and fixed a bug.irungentoo
Fixed a bug in Lossless UDP that prevented 2 clients from sometimes connecting when they connected at the same time to each other.
2013-07-27Fixed small astyle problems.irungentoo
2013-07-27Ran the code through: astyle --style=linuxirungentoo
2013-07-27Merge branch 'master' of https://github.com/KostyaKow/ProjectTox-Core into ↵irungentoo
KostyaKow-master Conflicts: core/DHT.c
2013-07-26A *lot* of style changes.Konstantin Kowalski
2013-07-26Merge pull request #115 from Astonex/masterirungentoo
Close the socket in shutdown_networking()
2013-07-26Merge pull request #111 from nfkd/patch-3irungentoo
Fix braces and a few whitespaces
2013-07-27Merge remote-tracking branch 'ProjectTox/master'Astonex
2013-07-27Close the socket in shutdown_networking()Astonex
2013-07-26Update DHT.cnfkd
2013-07-26Update DHT.cnfkd
2013-07-26Small inconsistency fixed.irungentoo
2013-07-26Fix braces and a few whitespacesnfkd
2013-07-26Fix braces and some white-spacesnfkd
2013-07-26Merge pull request #109 from nfkd/patch-1irungentoo
Fix braces
2013-07-26Fix bracesnfkd
2013-07-26stylingsometwo
haven't fixed switch statements because I'm lazy
2013-07-26Merge pull request #107 from sometwo/patch-4irungentoo
Fix some indenting
2013-07-26Fix some indentingsometwo
2013-07-26Fix braces and a commentsometwo
2013-07-26Fixed the multiple friends request recieved at the same time problem.irungentoo
2013-07-26Remove unnecessary bracesnfkd
2013-07-26I don't know how this happened.irungentoo
2013-07-26Added basic Local/LAN discovery.irungentoo
2013-07-26Minor screwup fixedSilentSand
I sure wish it was easier to compile on Windows.
2013-07-26Formatting.SilentSand
Many stylistic changes, mostly formatting code more closely to the coding style.