removed some magic numbers from line_eval()
Merge pull request #308 from jaekwon/bleh

various fixes for first time user
fix for #288

nTox will now display a message if you try to accept a not yet received
or already accepted friend request
Merge remote-tracking branch 'upstream/master'
fixed bug that would cause this to always exit
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
Removed memory leak, thanks to diath for spotting it.
added command functionality to chat windows and a few minor improvements
didn't mean to delete that
whoops, returning a free'd variable is really not what I meant...
already a pull request with this addition
toxic: Fixed doMessenger() interval.. Toxic is much faster and responsive now.
Manally merged #314 and #317
added fix in nTox_win32.c
Merge pull request #321 from plutooo/master

toxic: Fixed doMessenger() interval.. Toxic is much faster and responsiv...
Merge pull request #319 from stqism/master

Manually merged #314 and #317, resolving errors if both merged
Merge pull request #313 from CharmlessCoin/bug_fixes

Removed memory leak, thanks to diath for spotting it.
Merge pull request #311 from CharmlessCoin/nTox

nTox Cleaning
Fixed a calloc getting freed before being used
Merge pull request #325 from stqism/master

Fixed a calloc getting freed before being used