Merge branch 'master' of github.com:pjreddie/darknet

Joseph Redmon

2015-07-12 4b366754716fc4b5d0148de03ee8d9710df1bfdb

 src/server.h

@@ -1,4 +1,4 @@
#include "network.h"

void client_update(network net, char *address);
void server_update(network net);
void client_update(network net);