Merge branch 'mesh-through-mixer' into authentication

This commit is contained in:
Stephen Birarda 2014-02-07 13:50:39 -08:00
commit 94c449e10c
2 changed files with 4 additions and 4 deletions

View file

@ -8,9 +8,11 @@
// A really simple class that stores a network packet between being received and being processed
//
#include <cassert>
#include <cstring>
#include <QtDebug>
#include <cassert>
#include "SharedUtil.h"
#include "NetworkPacket.h"

View file

@ -18,9 +18,7 @@
#include <ifaddrs.h>
#endif
#include "HifiSockAddr.h"
#include "SharedUtil.h" // for MAX_PACKET_SIZE
#include "NodeList.h"
/// Storage of not-yet processed inbound, or not yet sent outbound generic UDP network packet
class NetworkPacket {