summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)Author
2010-09-01Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2010-09-01Merge branch 'master' into _multilangJonas Smedegaard
2010-09-01Fix have install target depend on init.Jonas Smedegaard
2010-09-01Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2010-09-01Merge branch 'master' into _multilangJonas Smedegaard
2010-09-01Create dummy_MODULES in init target.Jonas Smedegaard
2010-08-30Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): Makefile smiley
2010-08-30Merge branch 'nb' into _multilangJonas Smedegaard
Conflicts (manually resolve): Makefile basewiki ikiwiki_nb.setup templates
2010-08-30Merge branch 'da' into _multilangJonas Smedegaard
2010-07-19Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved: merge old and new parts): .gitmodules
2010-07-19Merge branch '_nb' into nbJonas Smedegaard
2010-07-19Merge branch '_da' into daJonas Smedegaard
2010-07-19Merge branch 'master' into _daJonas Smedegaard
2010-07-16Bump ikiwiki_VERSION in Makefile.Jonas Smedegaard
2010-07-11Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts: (manually resolved) .gitignore Makefile
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 _daJonas Smedegaard
2010-07-11Rewrite Makefiles and README to reflect use of Git submodule (not ↵Jonas Smedegaard
multi-layered Gits).
2008-10-23Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): .gitignore ikiwiki.setup ikiwiki_da.setup ikiwiki_nb.setup
2008-10-23Merge branch '_nb' into nbJonas Smedegaard
2008-10-23Merge branch '_da' into daJonas Smedegaard
2008-10-23Merge branch 'master' into _daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2008-10-22Sync with ikiwiki 2.67.Jonas Smedegaard
2008-08-30Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2008-08-30Merge branch '_nb' into nbJonas Smedegaard
2008-08-30Merge branch '_da' into daJonas Smedegaard
2008-08-30Merge branch 'master' into _daJonas Smedegaard
2008-08-30Sync POT and danish PO with ikiwiki 2.62.1.Jonas Smedegaard
2008-08-30Setup _dummy_xx (not _xx_dummy) in Makefile.Jonas Smedegaard
2008-08-15Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-15Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-15List admin setup before regular in Makefile (to minimize risk of public ↵Jonas Smedegaard
visible breakage).
2008-08-15Use locale-specific content. Fix danish underlay.Jonas Smedegaard
2008-08-15Add da and nb locales and enable their setups.Jonas Smedegaard
2008-08-14Switch to nb locale and ikiwiki_nb.setup in Makefile.Jonas Smedegaard
2008-08-11Fix use allinone branch (not clean).Jonas Smedegaard
2008-08-10Merge branch 'da' into allinone-daJonas Smedegaard
2008-08-10Enable da locale.Jonas Smedegaard
2008-08-10Move ikiwiki_admin.setup -> ikiwiki_da_admin.setup.Jonas Smedegaard
2008-08-10Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (manually resolved): Makefile ikiwiki_da.setup
2008-08-10Merge branch 'clean' into allinone-daJonas Smedegaard
2008-08-10Merge branch 'nonedit' into allinoneJonas Smedegaard
2008-08-10Change (again) to clean branch.Jonas Smedegaard
2008-08-10Revert to master branch (to ease merging).Jonas Smedegaard
2008-08-10Merge branch 'master' into allinoneJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Use and adapt new ikiwiki_da.setup. Drop ikiwiki.setup.Jonas Smedegaard
2008-08-10Merge branch 'master' into noneditJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Merge branch 'master' into cleanJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Disable PO-based locales by default.Jonas Smedegaard
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-15 04:20:12 +0000