diff options
| author | Florian Bruhin <git@the-compiler.org> | 2015-05-17 00:28:56 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2015-05-17 00:28:56 +0200 |
| commit | 3f98bf372edf9310050dfd9170f11fe8467dce1c (patch) | |
| tree | 9371861bc4f0c0cf303a678d0732ec1147f4d4db /doc/qutebrowser.1.asciidoc | |
| parent | 62426380e5331049fdb04cf63bc8ccdd79121705 (diff) | |
| parent | 9be5992a9a564df9838181374f5519395fbda3a2 (diff) | |
| download | qutebrowser-3f98bf372edf9310050dfd9170f11fe8467dce1c.tar.gz qutebrowser-3f98bf372edf9310050dfd9170f11fe8467dce1c.zip | |
Merge branch 'smoke'
Conflicts:
doc/qutebrowser.1.asciidoc
qutebrowser/app.py
qutebrowser/config/config.py
qutebrowser/qutebrowser.py
tox.ini
Diffstat (limited to 'doc/qutebrowser.1.asciidoc')
| -rw-r--r-- | doc/qutebrowser.1.asciidoc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/qutebrowser.1.asciidoc b/doc/qutebrowser.1.asciidoc index 2a403de5f..4c8ce2556 100644 --- a/doc/qutebrowser.1.asciidoc +++ b/doc/qutebrowser.1.asciidoc @@ -99,6 +99,9 @@ show it. *--temp-basedir*:: Use a temporary basedir. +*--no-err-windows*:: + Don't show any error windows (used for tests/smoke.py). + *--qt-name* 'NAME':: Set the window name. |