summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-10-25Merge branch 'wian' into allinone-nbJonas Smedegaard
2008-10-25Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2008-10-25Merge branch 'wian' into allinone-daJonas Smedegaard
2008-10-25Merge branch '_scs' into allinone-nbJonas Smedegaard
2008-10-25Merge branch 'nonedit' into allinone-daJonas Smedegaard
2008-10-25Merge branch '_clean' into allinone-nbJonas Smedegaard
2008-10-25Merge branch '_scs' into allinone-daJonas Smedegaard
2008-10-25Merge branch '_clean' into allinone-daJonas Smedegaard
2008-10-25Merge branch '_nb' into allinone-nbJonas Smedegaard
2008-10-25Merge branch '_da' into allinone-daJonas Smedegaard
2008-10-25Merge branch 'master' into _multilangJonas Smedegaard
2008-10-25Merge branch 'master' into allinone-nbJonas Smedegaard
2008-10-25Merge branch 'master' into allinone-daJonas Smedegaard
2008-10-25Merge branch 'master' into _nbJonas Smedegaard
2008-10-25Merge branch 'master' into _daJonas Smedegaard
2008-10-25Merge branch 'master' into wianJonas Smedegaard
2008-10-25Merge branch 'master' into noneditJonas Smedegaard
2008-10-25Merge branch 'master' into _cleanJonas Smedegaard
2008-10-25Merge branch 'master' into _scsJonas Smedegaard
2008-10-25Use full (but $PATH-expanded) path for libdir.Jonas Smedegaard
2008-10-24Use lang extension also for english admin config.Jonas Smedegaard
2008-10-24Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2008-10-24Use language extension also for english locale.Jonas Smedegaard
2008-10-23Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup ikiwiki_nb_admin.setup
2008-10-23Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2008-10-23Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): .gitignore ikiwiki.setup ikiwiki_da.setup ikiwiki_nb.setup
2008-10-23Fix use single-quotes.Jonas Smedegaard
2008-10-23Merge branch 'wian' into allinone-nbJonas Smedegaard
2008-10-23Merge branch 'nonedit' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_admin.setup ikiwiki_nb_admin.setup
2008-10-23Merge branch 'wian' into allinone-daJonas Smedegaard
2008-10-23Merge branch '_scs' into allinone-nbJonas Smedegaard
2008-10-23Merge branch '_clean' into allinone-nbJonas Smedegaard
2008-10-23Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_admin.setup ikiwiki_da_admin.setup
2008-10-23Merge branch '_scs' into allinone-daJonas Smedegaard
2008-10-23Merge branch '_clean' into allinone-daJonas Smedegaard
2008-10-23Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2008-10-23Merge branch '_da' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2008-10-23Merge branch 'master' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da_admin.setup
2008-10-23Merge branch 'master' into _multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2008-10-23Merge branch 'master' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb_admin.setup
2008-10-23Merge branch 'master' into _daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2008-10-23Merge branch 'master' into _nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2008-10-23Merge branch 'master' into wianJonas Smedegaard
2008-10-23Merge branch 'master' into noneditJonas Smedegaard
2008-10-23Merge branch 'master' into _cleanJonas Smedegaard
2008-10-23Merge branch 'master' into _scsJonas Smedegaard
2008-10-23Fix use -ikiwiki extension to Git hook.Jonas Smedegaard
2008-10-23Merge branch 'master' into noneditJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2008-10-23Merge branch 'master' into _scsJonas Smedegaard
2008-10-23Merge branch 'master' into _cleanJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup