diff options
| author |  Brendan Taylor <whateley@gmail.com> | 2011-04-14 20:59:39 -0600 |
|---|---|---|
| committer | Brendan Taylor <whateley@gmail.com> | 2011-04-14 20:59:39 -0600 |
| commit | ff92073acfb8029dde8c92ab5b70e3abde32e147 (patch) | |
| tree | 27a174315595a9cc1d96c13314bba56d22c325c5 /src/uzbl-core.c | |
| parent | 76f8d42568b7985de3c256f10d6d40ebd0dfd697 (diff) | |
| parent | 05b7422a9fcbb1cadf1beaff5ec0cea8b5b7a828 (diff) | |
Merge remote-tracking branch 'mathstuf/dev/fix-clashing-long-option' into experimental
Conflicts:
README
Diffstat (limited to 'src/uzbl-core.c')
| -rw-r--r-- | src/uzbl-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/uzbl-core.c b/src/uzbl-core.c index 204c89c..c095a7f 100644 --- a/src/uzbl-core.c +++ b/src/uzbl-core.c @@ -47,7 +47,7 @@ GOptionEntry entries[] = { "Uri to load at startup (equivalent to 'uzbl <uri>' or 'set uri = URI' after uzbl has launched)", "URI" }, { "verbose", 'v', 0, G_OPTION_ARG_NONE, &uzbl.state.verbose, "Whether to print all messages or just errors.", NULL }, - { "name", 'n', 0, G_OPTION_ARG_STRING, &uzbl.state.instance_name, + { "named", 'n', 0, G_OPTION_ARG_STRING, &uzbl.state.instance_name, "Name of the current instance (defaults to Xorg window id or random for GtkSocket mode)", "NAME" }, { "config", 'c', 0, G_OPTION_ARG_STRING, &uzbl.state.config_file, "Path to config file or '-' for stdin", "FILE" }, |