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
Fixed a calloc getting freed before being used
Merge pull request #325 from stqism/master

Fixed a calloc getting freed before being used
Make private functions in core/net_crypto.c static
Make private functions in core/Lossless_UDP.c static
Make private functions in core/LAN_discovery.c static
Make private functions in core/DHT.c static
Merge https://github.com/stqism/ProjectTox-Core
Fixed 2 Null pointer derefrences in both nTox and toxic
Merge pull request #327 from stqism/master

Fixed 2 Null pointer derefrences in both nTox and toxic
Merge pull request #326 from fhahn/private-functions-static2

Make private functions in core/ static
Fixed Windows build
Merge pull request #330 from nurupo/master

Fixed Windows build
Improved cmake
Added cmake options into INSTALL
Merge pull request #331 from nurupo/master

cmake improvements
Use void for functions with no parameters
Merge pull request #333 from fhahn/void-parameters

Use void for functions with no parameters