diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 23:06:01 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 23:06:01 +0200 |
| commit | 586fdb2600aa4ab49f043d532ac90ce58c61afd3 (patch) | |
| tree | eb028caffcdfa0ec768d0faa3369dc21c353599e /Makefile | |
| parent | fad3a41c440322f92d108ef74ec30feaed3dd12b (diff) | |
| parent | 207ac2343b5dd658f3d380dd92d1260fb2135b43 (diff) | |
Merge branch 'nonedit' into allinone-da
Conflicts (manually resolved):
Makefile
ikiwiki_da.setup
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -7,18 +7,18 @@ ikiwiki_BRANCH = clean-FLAVOR-LOCALE # modules (subproject extension names) used. Expands Git ORIGINs ikiwiki_MODULES = templates basewiki smiley # flavors used. Expands Git BRANCHes -#ikiwiki_basewiki_FLAVORS = nonedit -#ikiwiki_templates_FLAVORS = nonedit +ikiwiki_basewiki_FLAVORS = nonedit +ikiwiki_templates_FLAVORS = nonedit # locales used. Expands Git BRANCHes #ikiwiki_LOCALES = da nb # gettext-based modules and locales used #ikiwiki_POMODULES = basewiki smiley #ikiwiki_POLOCALES = da -#dummy_MODULES = content_dummy +dummy_MODULES = content_dummy # uncomment this when ikiwiki.setup is configured for the local environment -#CONFIGS = ikiwiki_da.setup +#CONFIGS = ikiwiki_da.setup ikiwiki_admin.setup # Everything after this is generic |