summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-10-01Merge branch '_scs' into allinoneJonas Smedegaard
2010-10-01Merge branch '_clean' into allinoneJonas Smedegaard
2010-10-01Merge branch 'master' into wianJonas Smedegaard
2010-10-01Merge branch 'master' into _scsJonas Smedegaard
2010-10-01Merge branch 'master' into _cleanJonas Smedegaard
2010-10-01Fix make space after hash optional in plugin h1title.Jonas Smedegaard
2010-09-16Merge branch 'wian' into allinoneJonas Smedegaard
2010-09-16Merge branch '_scs' into allinoneJonas Smedegaard
2010-09-16Merge branch '_clean' into allinoneJonas Smedegaard
2010-09-16Merge branch 'master' into wianJonas Smedegaard
2010-09-16Merge branch 'master' into _scsJonas Smedegaard
2010-09-16Merge branch 'master' into _cleanJonas Smedegaard
2010-09-16Add plugin h1title.Jonas Smedegaard
2010-09-03Merge branch 'wian' into allinoneJonas Smedegaard
2010-09-03Merge branch '_scs' into allinoneJonas Smedegaard
2010-09-03Merge branch '_clean' into allinoneJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2010-09-03Merge branch 'master' into wianJonas Smedegaard
2010-09-03Merge branch 'master' into _scsJonas Smedegaard
2010-09-03Merge branch 'master' into _cleanJonas Smedegaard
2010-09-03Fix always prepend basedir in ikiwiki config, and tidy our vars.Jonas Smedegaard
2010-09-01Merge branch 'wian' into allinoneJonas Smedegaard
2010-09-01Merge branch '_scs' into allinoneJonas Smedegaard
2010-09-01Merge branch '_clean' into allinoneJonas Smedegaard
2010-09-01Merge branch 'master' into wianJonas Smedegaard
2010-09-01Merge branch 'master' into _scsJonas Smedegaard
2010-09-01Merge branch 'master' into _cleanJonas Smedegaard
2010-09-01Fix have install target depend on init.Jonas Smedegaard
2010-09-01Merge branch 'wian' into allinoneJonas Smedegaard
2010-09-01Merge branch '_scs' into allinoneJonas Smedegaard
2010-09-01Merge branch '_clean' into allinoneJonas Smedegaard
2010-09-01Merge branch 'master' into wianJonas Smedegaard
2010-09-01Merge branch 'master' into _scsJonas Smedegaard
2010-09-01Merge branch 'master' into _cleanJonas Smedegaard
2010-09-01Drop TODO (locale files are now in same dir as smiley plugin).Jonas Smedegaard
2010-09-01Merge branch 'wian' into allinoneJonas Smedegaard
2010-09-01Merge branch '_scs' into allinoneJonas Smedegaard
2010-09-01Merge branch '_clean' into allinoneJonas Smedegaard
2010-09-01Merge branch 'master' into wianJonas Smedegaard
2010-09-01Merge branch 'master' into _scsJonas Smedegaard
2010-09-01Merge branch 'master' into _cleanJonas Smedegaard
2010-09-01Create dummy_MODULES in init target.Jonas Smedegaard
2010-09-01Merge branch 'wian' into allinoneJonas Smedegaard
2010-09-01Merge branch '_scs' into allinoneJonas Smedegaard
2010-09-01Fix generalize paths and URLs iki ikiwiki setup file.Jonas Smedegaard
2010-09-01Merge branch '_clean' into allinoneJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2010-08-31Merge branch 'master' into wianJonas Smedegaard
2010-08-31Merge branch 'master' into _scsJonas Smedegaard
2010-08-31Merge branch 'master' into _cleanJonas Smedegaard
2010-08-31Fix generalize gitrepo in ikiwiki setup file.Jonas Smedegaard
2010-08-31Merge branch 'master' into wianJonas Smedegaard