diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 15:10:44 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 15:10:44 +0200 |
| commit | 261cc31af5d1d9a568d3f713ce0273bd84aa889c (patch) | |
| tree | 117729e047585f76330edc8f8fc54f905572d1d8 /Makefile | |
| parent | 68bae5558772c36260bbc1db363a95436d6ab991 (diff) | |
| parent | ba197084b657f202d1e81424b8fdf71e191f6749 (diff) | |
Merge branch 'master' into allinone-nb
Conflicts (manually resolved):
ikiwiki_nb_admin.setup
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -6,14 +6,14 @@ ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE # Git branch (with capital FLAVOR and LOCALE replaced or stripped as needed) ikiwiki_BRANCH = master-FLAVOR-LOCALE # modules (subproject extension names) used. Expands Git ORIGINs -ikiwiki_MODULES = templates basewiki smiley +ikiwiki_MODULES = templates basewiki smiley directives # flavors used. Expands Git BRANCHes 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_POMODULES = basewiki smiley directives #ikiwiki_POLOCALES = da dummy_MODULES = content_dummy |