summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-07-31initialize num_requestsJfreegman
2013-07-31Clean up/format codeStuart Banks
2013-07-30Merge pull request #187 from Teknocrat/masterirungentoo
libconfig dependency
2013-07-30Merge branch 'patch-1' of https://github.com/Teknocrat/ProjectTox-Core into ↵teknocrat
patch-1
2013-07-30Create FindLibConfig.cmakeTeknocrat
Warning, this is a google snippet, but works fine, shouldn't be an issue
2013-07-30Update CMakeLists.txtTeknocrat
This thing requires libconfig but doesn't test for it...
2013-07-30Small fixes.irungentoo
2013-07-30Merge branch 'patch-3' of https://github.com/Astonex/ProjectTox-Core into ↵irungentoo
Astonex-patch-3
2013-07-30Merge pull request #183 from Proplex/masterirungentoo
Update readme with tutorial videos
2013-07-31Update Messenger.cAstonex
Offer more meaningful returns so appropriate actions can be taken by the GUI.
2013-07-30Remind users that directory isn't actually legitNemDiggers
2013-07-30break lineNemDiggers
2013-07-30Add tutorial videos to readmeNemDiggers
I promise they're legit<3
2013-07-30Merge pull request #179 from theshadowfog/patch-5irungentoo
Update nTox.c
2013-07-30Merge pull request #182 from RichiH/patch-1irungentoo
README.md: s/Freenode/freenode/
2013-07-31README.md: s/Freenode/freenode/Richard Hartmann
2013-07-30Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Coreirungentoo
2013-07-30Merge branch 'master' into nurupo-masterirungentoo
Conflicts: .travis.yml
2013-07-30Modified Travis to build libconfig from sourcesMaxim Biro
2013-07-30Update nTox.cGreg
Edited help message.
2013-07-30Merge pull request #178 from theshadowfog/patch-3irungentoo
Update nTox.c
2013-07-30Update nTox.cGreg
Gives the user his ID.
2013-07-30Merge pull request #174 from Shivamshaz/patch-1irungentoo
Update .gitignore
2013-07-30Merge pull request #175 from plutooo/masterirungentoo
Fixed a bunch of bugs in TOXIC, added friendlist and more.
2013-07-30Fixed a bunch of bugs in TOXIC, added friendlist and more.plutooo
2013-07-30Merge pull request #1 from irungentoo/masterplutooo
pull latest
2013-07-30Merge pull request #172 from rylai-/masterirungentoo
travis: use apt-get -y option instead of GNU yes
2013-07-30travis: use -q instead of -qq to prevent travis from sometimes timing out on ↵Rylai
long apt-get updates
2013-07-30travis: use apt-get -y option instead of GNU yesRylai
The Advanced Packaging Tool has an option to automatically assume Yes to all queries. We don't need to use GNU yes for this.
2013-07-30Update .gitignoreShivam Bansal
2013-07-30Fixed segfault.irungentoo
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-30Merge pull request #168 from nurupo/masterirungentoo
Added a note about libconfig
2013-07-30Added a note about libconfigMaxim Biro
2013-07-30Merge branch 'patch-1' of https://github.com/dypa/ProjectTox-Core into ↵irungentoo
dypa-patch-1 Conflicts: INSTALL.md
2013-07-30Merge pull request #166 from theshadowfog/patch-2irungentoo
Update nTox.c
2013-07-30Merge pull request #165 from nurupo/masterirungentoo
Fixed cmake
2013-07-30Fixed cmakeMaxim Biro
2013-07-30Update nTox.cGreg
Added help command to nTox.c
2013-07-30added utility function format_messagePeter Maatman
2013-07-30changing testing clients to reflect changes made in core/Messenger.hPeter Maatman
2013-07-30renamed getname to getfriendname and added a getname function to get the ↵Peter Maatman
name of our client
2013-07-30Merge pull request #161 from theshadowfog/patch-1irungentoo
Update INSTALL.md
2013-07-30Update INSTALL.mdGreg
2013-07-30replace make install to checkinstall for linux installationdypa
2013-07-30Fixed warning.irungentoo
2013-07-30Typo in readme fixed.irungentoo
2013-07-30Fixed build.irungentoo
2013-07-30Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere ↵irungentoo
into nurupo-master Conflicts: testing/CMakeLists.txt