diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 15:04:12 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 15:45:26 +0200 |
| commit | 434cd6f0c3b31ac57f138b5e3333278c846ff383 (patch) | |
| tree | 15795bb7ef846f121d885b07447efd1a12860ae7 /Makefile | |
| parent | c6b99ac69908c3ae2ac2932f602f6e7a5a45084d (diff) | |
| parent | ba197084b657f202d1e81424b8fdf71e191f6749 (diff) | |
Merge branch 'master' into allinone-da
Conflicts (manually resolved):
ikiwiki_da_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 = allinone-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 # gettext-based modules and locales used -#ikiwiki_POMODULES = basewiki smiley +#ikiwiki_POMODULES = basewiki smiley directives #ikiwiki_POLOCALES = da dummy_MODULES = content_dummy |