summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-10-04Merge branch 'da' into _multilangJonas Smedegaard
2010-10-04Merge branch '_da' into daJonas Smedegaard
2010-10-04Merge branch 'master' into _multilangJonas Smedegaard
2010-10-04Merge branch 'master' into _daJonas Smedegaard
2010-10-04Strip non-git VCS cruft from ikiwiki config.Jonas Smedegaard
2010-10-04Use $SRCDIR favored over $PWD in ikiwiki config.Jonas Smedegaard
2010-10-01Merge branch 'nb' into _multilangJonas Smedegaard
2010-10-01Merge branch 'da' into _multilangJonas Smedegaard
2010-10-01Merge branch '_da' into daJonas Smedegaard
2010-10-01Merge branch '_nb' into nbJonas Smedegaard
2010-10-01Merge branch 'master' into _multilangJonas Smedegaard
2010-10-01Merge branch 'master' into _daJonas Smedegaard
2010-10-01Merge branch 'master' into _nbJonas Smedegaard
2010-10-01Fix make space after hash optional in plugin h1title.Jonas Smedegaard
2010-09-30Merge branch 'nb' into _multilangJonas Smedegaard
2010-09-30Merge branch 'da' into _multilangJonas Smedegaard
2010-09-16Merge branch '_da' into daJonas Smedegaard
2010-09-16Merge branch '_nb' into nbJonas Smedegaard
2010-09-16Merge branch 'master' into _multilangJonas Smedegaard
2010-09-16Merge branch 'master' into _nbJonas Smedegaard
2010-09-16Merge branch 'master' into _daJonas Smedegaard
2010-09-16Add plugin h1title.Jonas Smedegaard
2010-09-03Merge branch 'nb' into _multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-09-03Merge branch 'da' into _multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2010-09-03Merge branch '_da' into daJonas Smedegaard
2010-09-03Merge branch '_nb' into nbJonas Smedegaard
2010-09-03Merge branch 'nb' into _multilangJonas Smedegaard
2010-09-03Merge branch 'da' into _multilangJonas Smedegaard
2010-09-03Merge branch 'master' into _multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2010-09-03Merge branch 'master' into _nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-09-03Merge branch 'master' into _daJonas Smedegaard
Conflicts (resolved manually): ikiwiki_da.setup
2010-09-03Fix always prepend basedir in ikiwiki config, and tidy our vars.Jonas Smedegaard
2010-09-01Merge branch '_da' into daJonas Smedegaard
2010-09-01Merge branch '_nb' into nbJonas Smedegaard
2010-09-01Merge branch 'nb' into _multilangJonas Smedegaard
2010-09-01Merge branch 'master' into _nbJonas Smedegaard
2010-09-01Merge branch 'da' into _multilangJonas Smedegaard
2010-09-01Merge branch 'master' into _multilangJonas Smedegaard
2010-09-01Merge branch 'master' into _daJonas Smedegaard
2010-09-01Fix have install target depend on init.Jonas Smedegaard
2010-09-01Merge branch '_da' into daJonas Smedegaard
2010-09-01Merge branch '_nb' into nbJonas Smedegaard
2010-09-01Merge branch 'master' into _nbJonas Smedegaard
2010-09-01Merge branch 'nb' into _multilangJonas Smedegaard
2010-09-01Merge branch 'master' into _daJonas Smedegaard
2010-09-01Merge branch 'da' into _multilangJonas Smedegaard
2010-09-01Merge branch 'master' into _multilangJonas Smedegaard
2010-09-01Drop TODO (locale files are now in same dir as smiley plugin).Jonas Smedegaard
2010-09-01Merge branch '_da' into daJonas Smedegaard
2010-09-01Merge branch '_nb' into nbJonas Smedegaard