Merge branch 'master' of https://github.com/KostyaKow/ProjectTox-Core into KostyaKow-master

Conflicts:
	core/DHT.c

1 files changed, 1 insertions, 1 deletions

diff --git a/core/LAN_discovery.h b/core/LAN_discovery.h
index 655830f9..cca5bd30 100644
--- a/core/LAN_discovery.h
+++ b/core/LAN_discovery.h
@@ -39,7 +39,7 @@ int send_LANdiscovery(uint16_t port);
 /* if we receive a packet we call this function so it can be handled.
    return 0 if packet is handled correctly.
    return 1 if it didn't handle the packet or if the packet was shit. */
-int LANdiscovery_handlepacket(uint8_t * packet, uint32_t length, IP_Port source);
+int LANdiscovery_handlepacket(uint8_t *packet, uint32_t length, IP_Port source);