diff options
author | intrigeri <intrigeri@boum.org> | 2010-07-11 10:46:18 +0200 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2010-07-11 10:46:18 +0200 |
commit | c99d26030e6ddd7a21932e98e40a8df7d896886d (patch) | |
tree | 26056e3e2a5c7c81ebe7baf243a0bb4ae765e76e /IkiWiki.pm | |
parent | c9b1a4dd7d826b5e8e2d0a757ba5ecbba8d832b2 (diff) | |
parent | 1bb9157f2ab94b8306e1e2fb1a5b3ac9bbfe5772 (diff) |
Merge remote branch 'upstream/master' into prv/po
Conflicts:
IkiWiki/Plugin/po.pm
doc/plugins/po.mdwn
Diffstat (limited to 'IkiWiki.pm')
-rw-r--r-- | IkiWiki.pm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 7b5fd283d..f9a30a202 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -441,6 +441,13 @@ sub getsetup () { safe => 0, rebuild => 0, }, + wrapper_background_command => { + type => "internal", + default => '', + description => "background shell command to run", + safe => 0, + rebuild => 0, + }, gettime => { type => "internal", description => "running in gettime mode", |