diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-26 00:13:34 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-26 00:13:34 +0200 |
| commit | 3a63187b4725a5e07516c7cb94cd4e6b3853b5d7 (patch) | |
| tree | c1610521e6f4e4a3c70683721f4ab6a6ac67d610 /dep/recastnavigation/Recast/Source/RecastLayers.cpp | |
| parent | 50cf908d787b8a0d84c95fcc681fc07189a3025e (diff) | |
| parent | 17fd20f50c09aaff6b6741353b8ab21bff8f12fd (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
dep/PackageList.txt
src/server/game/DataStores/DBCEnums.h
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStores.h
src/server/game/DataStores/DBCfmt.h
Diffstat (limited to 'dep/recastnavigation/Recast/Source/RecastLayers.cpp')
| -rw-r--r-- | dep/recastnavigation/Recast/Source/RecastLayers.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dep/recastnavigation/Recast/Source/RecastLayers.cpp b/dep/recastnavigation/Recast/Source/RecastLayers.cpp index 204f72e8cb2..cb1a39f4bda 100644 --- a/dep/recastnavigation/Recast/Source/RecastLayers.cpp +++ b/dep/recastnavigation/Recast/Source/RecastLayers.cpp @@ -38,7 +38,7 @@ struct rcLayerRegion unsigned char layerId; // Layer ID unsigned char nlayers; // Layer count unsigned char nneis; // Neighbour count - unsigned char base; // Flag indicating if the region is hte base of merged regions. + unsigned char base; // Flag indicating if the region is the base of merged regions. }; |