diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 16:59:56 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-20 16:59:56 +0100 |
| commit | 551675cb8284b03a1e43be9d11eda0bab7b70139 (patch) | |
| tree | eed1121d421176f4044e5f38190c767f6b905388 /src/main.cpp | |
| parent | ae14594cfa804a89a36312e142498eca7f147cc9 (diff) | |
| parent | d4a407254cfffbb79087c1248650fbaed5d568d8 (diff) | |
| download | mana-551675cb8284b03a1e43be9d11eda0bab7b70139.tar.gz mana-551675cb8284b03a1e43be9d11eda0bab7b70139.tar.bz2 mana-551675cb8284b03a1e43be9d11eda0bab7b70139.tar.xz mana-551675cb8284b03a1e43be9d11eda0bab7b70139.zip | |
Merge branch 'master' into lpc2012
Conflicts:
src/graphics.h
src/gui/setup_video.cpp
src/gui/specialswindow.cpp
src/gui/viewport.cpp
src/gui/widgets/container.cpp
src/gui/widgets/container.h
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index b7669f0e..e3225d63 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -150,7 +150,8 @@ static void parseOptions(int argc, char *argv[], Client::Options &options) options.noOpenGL = true; break; case 'T': - options.chatLogDir = std::string(optarg); + options.chatLogDir = optarg; + break; case 'i': options.screenshotDir = optarg; break; |