summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)Author
2010-10-05Merge branch '_da' into allinone-daJonas Smedegaard
2010-10-05Merge branch 'master' into _daJonas Smedegaard
2010-10-05Fix dummy_MODULES init rule in Makefile.Jonas Smedegaard
2010-10-05Merge branch '_da' into allinone-daJonas Smedegaard
2010-10-05Merge branch 'master' into _daJonas Smedegaard
2010-10-05Create dummy git repos for dummy content (not-git folders may upset ↵Jonas Smedegaard
Ikiwiki). Clean dummy content dirs in clean (not ultraclean).
2010-09-01Merge branch '_da' into allinone-daJonas 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 allinone-daJonas Smedegaard
2010-09-01Merge branch 'master' into _daJonas Smedegaard
2010-09-01Create dummy_MODULES in init target.Jonas Smedegaard
2010-07-19Merge branch 'master' into allinone-daJonas Smedegaard
Conflicts (manually resolved: merge old and new parts): .gitmodules
2010-07-19Merge branch 'master' into _daJonas Smedegaard
2010-07-16Bump ikiwiki_VERSION in Makefile.Jonas Smedegaard
2010-07-11Merge branch 'master' into allinone-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 'master' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da_admin.setup
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 'master' into allinone-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-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-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-10Change (again) to clean branch.Jonas Smedegaard
2008-08-10Revert to master branch (to ease merging).Jonas Smedegaard
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
2008-08-10Reorder and comment Makefile variables.Jonas Smedegaard
2008-08-10Use nonedit branch and dummy content for main setup.Jonas Smedegaard
2008-08-10Fork ikiwiki.setup as ikiwiki_admin.setup.Jonas Smedegaard
2008-08-10Merge branch 'master' into cleanJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-10Disable locales and flavors by default.Jonas Smedegaard
2008-08-09Merge branch 'master' into cleanJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-09Extend make to support FLAVORS.Jonas Smedegaard
2008-08-09Merge branch 'master' into cleanJonas Smedegaard
Conflicts (manually resolved): Makefile
2008-08-09Fix bogus locale no_NB -> nb.Jonas Smedegaard
2008-07-13Drop non-Git VCS options from config. Use clean content branches.Jonas Smedegaard
2008-05-30Split rule-exansions from main Makefile to make/rules.mk.Jonas Smedegaard
2008-04-14Name local l10n branches matching remote ones, when init'ing git.Jonas Smedegaard