diff options
| author | David Athay <ko2fan@gmail.com> | 2009-01-13 00:28:58 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-01-13 00:28:58 +0000 |
| commit | 224da21ea258450fcc78dd7635de84aba1d1df5e (patch) | |
| tree | dc4df492779986aff60ed785f4821daae968d023 /tools/tmxcopy | |
| parent | d7a5438d3c7b140c0966243bae98ff447385d246 (diff) | |
| parent | ed60c53eb2fe5ef377fc726df796d0aaf2005c6c (diff) | |
| download | mana-224da21ea258450fcc78dd7635de84aba1d1df5e.tar.gz mana-224da21ea258450fcc78dd7635de84aba1d1df5e.tar.bz2 mana-224da21ea258450fcc78dd7635de84aba1d1df5e.tar.xz mana-224da21ea258450fcc78dd7635de84aba1d1df5e.zip | |
Merge branch 'master' of git://gitorious.org/tmw/eathena
Diffstat (limited to 'tools/tmxcopy')
| -rw-r--r-- | tools/tmxcopy/main.cpp | 2 | ||||
| -rw-r--r-- | tools/tmxcopy/map.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/tmxcopy/main.cpp b/tools/tmxcopy/main.cpp index 92a69c54..f50c0af4 100644 --- a/tools/tmxcopy/main.cpp +++ b/tools/tmxcopy/main.cpp @@ -28,7 +28,7 @@ int main(int argc, char * argv[] ) // parsing command line options if (argc < 9 || argc > 10) { - std::cerr<<"Usage: srcFile x y width height tgtFile x y [outfile]"; + std::cerr<<"Usage: srcFile x y width height tgtFile x y [outfile]\n"; return -1; } diff --git a/tools/tmxcopy/map.cpp b/tools/tmxcopy/map.cpp index b554aac2..82fe0f8f 100644 --- a/tools/tmxcopy/map.cpp +++ b/tools/tmxcopy/map.cpp @@ -23,6 +23,7 @@ #include <map> #include <list> +#include <string.h> #include <zlib.h> #include "xmlutils.h" |