summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-30Fix "comparison is always true due to limited range of data type" warningDmitry Marakasov
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-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
2013-07-30Merge pull request #146 from boredomist/patch-1irungentoo
Replace magic value "7" with string "echo"
2013-07-30Merge pull request #154 from xistance21/masterirungentoo
Add invalid command
2013-07-30Merge pull request #155 from Astonex/masterirungentoo
Updating nTox_win32 and adding Messenger.c method
2013-07-30Merge pull request #152 from rlewon/messenger_friend_list_ntoxirungentoo
New friend list function for nTox client.
2013-07-30Merge pull request #150 from Astonex/patch-2irungentoo
Update INSTALL.md
2013-07-30Add invalid commandEmir Unluturk
2013-07-30Implemented m_delfriend()Astonex
2013-07-30Slight aesthetic changeAstonex
2013-07-30Fixed the friends listingAstonex
2013-07-30Fixed bugs, added friend listing (slightly buggy), and changed the general ↵Astonex
aesthetics
2013-07-30Removed unneeded include.Ryan Lewon
Fixed formatting and cleaned up output.
2013-07-30New friend list function for nTox client.Ryan Lewon
2013-07-30Update INSTALL.mdAstonex
Changing the libsodium link from a list of its release archives to the windows specific one - it is windows specific install instructions after all.
2013-07-29Replace magic value "7" with string "echo"Erik Price
2013-07-29Fixed function signatureMaxim Biro