summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-07-11Merge branch '_nb' into nbJonas Smedegaard
2010-07-11Merge branch '_da' into daJonas Smedegaard
2010-07-11Use main basewiki and templates dir (not ...l10n subdir) in ikiwiki_da.config.Jonas Smedegaard
2010-07-11Use main basewiki and templates dir (not ...l10n subdir) in ikiwiki_nb.config.Jonas Smedegaard
2010-07-11Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
2010-07-11Merge branch 'wian' into allinone-nbJonas Smedegaard
Conflicts: basewiki templates
2010-07-11Merge branch '_scs' into allinone-nbJonas Smedegaard
Conflicts: basewiki templates
2010-07-11Sync with allinone-nb branch of basewiki, smiley and templates.Jonas Smedegaard
2010-07-11Merge branch 'wian' into allinone-daJonas Smedegaard
Conflicts: basewiki templates
2010-07-11Merge branch '_scs' into allinone-daJonas Smedegaard
Conflicts: basewiki templates
2010-07-11Sync with allinone-da branch of basewiki, smiley and templates.Jonas Smedegaard
2010-07-11Merge branch '_nb' into nbJonas Smedegaard
2010-07-11Merge branch '_da' into daJonas Smedegaard
2010-07-11Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-07-11Merge branch '_da' into allinone-daJonas Smedegaard
2010-07-11Sync with master_da branch of basewiki, smiley and templates.Jonas Smedegaard
2010-07-11Sync with master-nb branch of basewiki, smiley and templates.Jonas Smedegaard
2010-07-11Sync with scs branch of basewiki and templates.Jonas Smedegaard
2010-07-11Sync with wian branch of templates.Jonas Smedegaard
2010-07-11Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-07-11Merge branch '_da' into allinone-daJonas Smedegaard
2010-07-11Sync with clean branch of basewiki, smiley and templates.Jonas Smedegaard
2010-07-11Sync with clean branch of basewiki, smiley and templates.Jonas Smedegaard
2010-07-11Sync with clean branch of basewiki.Jonas Smedegaard
2010-07-11Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-07-11Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): Makefile
2010-07-11Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts: (manually resolved) .gitignore Makefile
2010-07-11Merge branch 'wian' into allinone-nbJonas Smedegaard
2010-07-11Merge branch 'wian' into allinone-daJonas Smedegaard
2010-07-11Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2010-07-11Merge branch '_scs' into allinone-nbJonas Smedegaard
2010-07-11Merge branch '_clean' into allinone-nbJonas Smedegaard
2010-07-11Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts: Makefile (manually resolved)
2010-07-11Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-07-11Merge branch '_scs' into allinone-daJonas Smedegaard
2010-07-11Merge branch '_clean' into allinone-daJonas Smedegaard
2010-07-11Merge branch '_da' into allinone-daJonas Smedegaard
2010-07-11Merge branch '_nb' into nbJonas Smedegaard
Conflicts: Makefile (manually resolved)
2010-07-11Merge branch '_da' into daJonas Smedegaard
Conflicts: Makefile (manually resolved)
2010-07-11Merge branch 'master' into _multilangJonas Smedegaard
2010-07-11Merge branch 'master' into allinone-nbJonas Smedegaard
Conflicts: Makefile (manually resolved)
2010-07-11Merge branch 'master' into allinone-daJonas Smedegaard
Conflicts: Makefile (manually resolved)
2010-07-11Merge branch 'master' into _daJonas Smedegaard
2010-07-11Merge branch 'master' into _nbJonas Smedegaard
2010-07-11Merge branch 'master' into wianJonas Smedegaard
2010-07-11Merge branch 'master' into noneditJonas Smedegaard
Conflicts: Makefile (resolved manually)
2010-07-11Merge branch 'master' into _scsJonas Smedegaard
2010-07-11Merge branch 'master' into _cleanJonas Smedegaard
2010-07-11Rewrite Makefiles and README to reflect use of Git submodule (not ↵Jonas Smedegaard
multi-layered Gits).
2010-07-11Add basewiki, directives, smiley and templates as submodules, and no longer ↵Jonas Smedegaard
gitignore them.
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-16 20:46:47 +0000