diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-03 21:03:09 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-03 21:03:09 +0200 |
| commit | 6514e21b7cd8ec3ef7c0c44653d99245b3f57012 (patch) | |
| tree | 05168035617cf85af3cc7c20d373a9393464e72a /src/tools | |
| parent | 611d51af9837dec14dd320d24ac564991830ba6e (diff) | |
| parent | 5b95301de51e7706ce07a5f2c185ab32decc23f7 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/tools/map_extractor/System.cpp
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/mmaps_generator/PathGenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/mmaps_generator/PathGenerator.cpp b/src/tools/mmaps_generator/PathGenerator.cpp index ed114491b27..882ec7ffb66 100644 --- a/src/tools/mmaps_generator/PathGenerator.cpp +++ b/src/tools/mmaps_generator/PathGenerator.cpp @@ -235,7 +235,7 @@ bool handleArgs(int argc, char** argv, int finish(const char* message, int returnValue) { printf("%s", message); - getchar(); + getchar(); // Wait for user input return returnValue; } |