summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-03Merge branch 'nTox' of https://github.com/CharmlessCoin/ProjectTox-Core into ↵irungentoo
CharmlessCoin-nTox Conflicts: testing/nTox.c
2013-08-03Merge pull request #276 from stqism/masterirungentoo
Adds timestamp to toxic, fixes issue #217
2013-08-03Merge pull request #305 from CharmlessCoin/toxicirungentoo
Toxic -f Flag
2013-08-03added a proper error message for messing up the -f flagcharmlesscoin
2013-08-03Merge pull request #304 from yati-sagade/masterirungentoo
Fixed a link in the README.
2013-08-03added the -f flag for toxiccharmlesscoin
2013-08-04Fixed a linkYati Sagade
2013-08-04Fixed a linkYati Sagade
2013-08-03Removed an early breakSean Qureshi
2013-08-03Merge branch 'master' of https://github.com/stqism/ProjectTox-CoreSean Qureshi
2013-08-03Merge pull request #5 from stqism/toxic-testingSean Qureshi
Toxic testing
2013-08-03Merge branch 'master' of https://github.com/irungentoo/ProjectTox-CoreSean Qureshi
2013-08-03Merge pull request #4 from m-kress/masterSean Qureshi
fixed time stamps in toxic
2013-08-03Merge pull request #302 from ChlorideCull/masterirungentoo
Changed CMake options to compile the core as a shared library instead of static
2013-08-03Fixed compatibility with original NaCl.irungentoo
2013-08-03Changed CMake options to compile the core sharedChloride Cull
It is now compiled under 'toxcore' instead of just 'core' to be able to be installed without conflicts.
2013-08-03Merge pull request #299 from plutooo/masterirungentoo
DHT: added id_equal(), ipport_equal(), is_timeout()
2013-08-03Merge pull request #300 from Proplex/masterirungentoo
People aren't that excited to send messages
2013-08-03People aren't that excited to send messagesNemDiggers
2013-08-03DHT: added id_equal(), ipport_equal(), is_timeout()plutooo
2013-08-03Merge pull request #298 from Proplex/masterirungentoo
Update readme to refer to new developer blog.
2013-08-03Update readme to refer to new developer blog.NemDiggers
If you need an account on the CMS; contact me on IRC.
2013-08-03Merge pull request #296 from Astonex/masterirungentoo
nTox_win32 - Small changes to friends list
2013-08-03added seconds to time stamp in toxicMichael Kress
2013-08-03Merge branch 'master' of github.com:m-kress/ProjectTox-CoreMichael Kress
2013-08-03Changing status to offline when quitting wont overwrite last saved statusAstonex
2013-08-03fixed printing time stamp in toxicMichael Kress
2013-08-03Merge branch 'master' of git://github.com/irungentoo/ProjectTox-CoreAstonex
2013-08-03nTox_win32 - Updated friends list displayAstonex
2013-08-03Merge pull request #281 from JFreegman/masterirungentoo
cursor done better, fixed for chat windows
2013-08-03Merge pull request #282 from bakwc/masterirungentoo
Curses dependence added to CMake
2013-08-03Merge pull request #287 from greato/masterirungentoo
Added break; Statement
2013-08-03Merge pull request #290 from pb82/masterirungentoo
Fedora specific installation instructions
2013-08-03Merge pull request #291 from m-kress/masterirungentoo
added backspace to nTox; removed trailing spaces
2013-08-03typopb82
2013-08-03rearranged fedora specific instructionspb82
2013-08-03added some more details (libsodium without checkinstall)pb82
2013-08-03added backspace to nTox; removed trailing spacesMichael Kress
2013-08-03should be 'make check'pb82
2013-08-03installation instructions for Fedora (17)pb82
2013-08-03Merge pull request #3 from stqism/masterSean Qureshi
Removed some useless code
2013-08-03Removed some useless codeSean Qureshi
2013-08-03Merge pull request #2 from stqism/masterSean Qureshi
Adds fixes from master in testing
2013-08-03Merge branch 'master' of github.com:stqism/ProjectTox-CoreSean Qureshi
2013-08-03Fixed a segfault when recieving textSean Qureshi
2013-08-03Merge remote-tracking branch 'ProjectTox/master'Astonex
2013-08-03Can only accept friend request when one is pending nowAstonex
2013-08-03Merge pull request #1 from stqism/masterSean Qureshi
Toxic testing
2013-08-03Added a break from a pull requestSean Qureshi
Merged a change from https://github.com/greato/ProjectTox-Core
2013-08-03Merged a change from a pull request, added a breakSean Qureshi
Merged from https://github.com/greato/ProjectTox-Core
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-15 03:26:34 +0000