summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
authorChristopher Smith <chris@jalakai.co.uk>2010-03-16 12:19:59 +0000
committerChristopher Smith <chris@jalakai.co.uk>2010-03-16 12:19:59 +0000
commit29706daf7cba8a9eec8f6882ea6cd67ba3d0c2ef (patch)
tree677da411ea151ec3003d0dfe874afd422abb7044 /inc
parente0415e22d2d7d48385734c5c4a8e1770c36426c9 (diff)
parent94d621b02d20870ce6ddac900faf60ae784f8747 (diff)
downloadrpg-29706daf7cba8a9eec8f6882ea6cd67ba3d0c2ef.tar.gz
rpg-29706daf7cba8a9eec8f6882ea6cd67ba3d0c2ef.tar.bz2
Merge branch 'master' of git@github.com:splitbrain/dokuwiki
Diffstat (limited to 'inc')
-rw-r--r--inc/load.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/inc/load.php b/inc/load.php
index 796ccec77..f0945c5bc 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -69,7 +69,7 @@ function load_autoload($name){
'Doku_Plugin_Controller'=> DOKU_INC.'inc/plugincontroller.class.php',
'GeSHi' => DOKU_INC.'inc/geshi.php',
'TarLib' => DOKU_INC.'inc/TarLib.class.php',
- 'ZibLib' => DOKU_INC.'inc/ZipLib.class.php',
+ 'ZipLib' => DOKU_INC.'inc/ZipLib.class.php',
'DokuWikiFeedCreator' => DOKU_INC.'inc/feedcreator.class.php',
'Doku_Parser_Mode' => DOKU_INC.'inc/parser/parser.php',