Merge remote-tracking branch 'origin/master' into SplitSnapshots

# Conflicts: # src/Engine/Network/Server.cpp
2016-03-09 18:41:01 +01:00
parent 3209e36176 3436ba6656
commit c36c7d1ea6
17 changed files with 4634 additions and 4186 deletions
@@ -12,6 +12,7 @@ public:
    { }

    virtual void Update(double dt) override;
+private:
 };

 #endif