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 /docs/manaplus.6 | |
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 'docs/manaplus.6')
-rw-r--r-- | docs/manaplus.6 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/manaplus.6 b/docs/manaplus.6 index dbde16d49..3ae55c1c1 100644 --- a/docs/manaplus.6 +++ b/docs/manaplus.6 @@ -1,6 +1,6 @@ .TH "ManaPlus" "6" .SH "NAME" -mana \- ManaPlus: A 2D MMORPG client +manaplus \- ManaPlus: A 2D MMORPG client .SH "SYNOPSIS" \fBmanaplus\fR .SH "DESCRIPTION" @@ -57,7 +57,7 @@ Skip the update process. .B \-d, \-\-data Directory to load game data from. .TP -.B \-L, \-\-local\-data\-dir +.B \-L, \-\-localdata\-dir Directory to use as local data directory. .TP .B \-\-screenshot\-dir |