diff options
| author | MitchesD <majklprofik@seznam.cz> | 2015-05-30 19:34:25 +0200 |
|---|---|---|
| committer | MitchesD <majklprofik@seznam.cz> | 2015-05-30 19:34:25 +0200 |
| commit | 0cf02097414ddf7a370bd2efef5b892616e8de93 (patch) | |
| tree | 85fb8e5581cdb171785fd8e2c3073199d7ca4bd1 /src/server/collision/Maps/TileAssembler.cpp | |
| parent | 12d59623fff5fe88d2fff0e8ddcabad7bec62c71 (diff) | |
| parent | b6e926fa2f3f894e9b1d9d38e45390235ae749d5 (diff) | |
Merge pull request #14782 from doctaweeks/fixes-for-6.x
Minor fixes for 6.x
Diffstat (limited to 'src/server/collision/Maps/TileAssembler.cpp')
| -rw-r--r-- | src/server/collision/Maps/TileAssembler.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp index 86391d5488a..ce39dc02da8 100644 --- a/src/server/collision/Maps/TileAssembler.cpp +++ b/src/server/collision/Maps/TileAssembler.cpp @@ -24,7 +24,6 @@ #include <set> #include <iomanip> #include <sstream> -#include <iomanip> using G3D::Vector3; using G3D::AABox; |