Merge remote-tracking branch 'clement/protocol' into atp

This commit is contained in:
Stephen Birarda 2015-07-08 19:12:33 -07:00
commit 1f689c8fe6

View file

@ -26,7 +26,7 @@
#include "LogHandler.h"
EntityTree::EntityTree(bool shouldReaverage) :
EntityTree::EntityTree(bool shouldReaverage) :
Octree(shouldReaverage),
_fbxService(NULL),
_simulation(NULL)