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'
added fix in nTox_win32.c
Merge pull request #330 from nurupo/master

Fixed Windows build
Merge pull request #331 from nurupo/master

cmake improvements
added ability to close and reopen chat windows & other minor changes
test
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into testing
init array
Use void for functions with no parameters
Merge pull request #333 from fhahn/void-parameters

Use void for functions with no parameters
Merge pull request #312 from Niautanor/master

fix for Issue #288
temporary fix to prevent m_addfriend from segfaulting
Merge pull request #334 from lukechampine/master

temporary fix to prevent m_addfriend from segfaulting
Fixed toxic friends list flicker
Added a 'clear' function to the prompt
Merge remote-tracking branch 'upstream/master' into testing
Merge pull request #338 from Nominate/patch-1

Added a 'clear' function to the prompt
Grammar/aesthetic amendment
Merge pull request #339 from Nominate/patch-3

Grammar/aesthetic amendment