diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
| commit | d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch) | |
| tree | 5f128768c66436eefd70632f02889607596609d4 /src/main.cpp | |
| parent | f1e92aca00a4859047e83fab76220767b9a2f814 (diff) | |
| parent | e93e6beb456d105987da3190c2a80847b6900081 (diff) | |
| download | plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.gz plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.bz2 plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.xz plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.zip | |
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index 5c13b10ec..5eceee77b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -44,10 +44,11 @@ static void printHelp() using std::endl; std::cout - << _("manaplus [options] [mana-file]") << endl << endl - << _("[mana-file] : The mana file is an XML file (.mana)") << endl - << _(" used to set custom parameters") << endl - << _(" to the manaplus client.") + << _("manaplus [options] [manaplus-file]") << endl << endl + << _("[manaplus-file] : The manaplus file is an XML file (.manaplus)") + << endl + << _(" used to set custom parameters") << endl + << _(" to the manaplus client.") << endl << endl << _("Options:") << endl << _(" -l --log-file : Log file to use") << endl |