diff options
| author | intrigeri <intrigeri@boum.org> | 2009-01-15 20:04:31 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-01-15 20:04:31 +0100 |
| commit | e6992480e2e0cf965650f84aa97e01fe0fa71544 (patch) | |
| tree | b4c1743a8f99d22788e190b46f5cb1c09b9b50bb /IkiWiki.pm | |
| parent | 48de7f9c7b387ca9f21294b47efc58e7dd64c6ad (diff) | |
| parent | 63fe022602b622eb80bd38d64ee272b543ce0418 (diff) | |
Merge commit 'upstream/master' into prv/po
Conflicts:
debian/control
Diffstat (limited to 'IkiWiki.pm')
| -rw-r--r-- | IkiWiki.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 4601d8590..ca483a111 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -26,7 +26,7 @@ our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match %pagesources %destsources); our $VERSION = 3.00; # plugin interface version, next is ikiwiki version our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE -my $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE +our $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE # Optimisation. use Memoize; |