diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:37:58 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:37:58 +0200 |
| commit | 7b29486aff134aa1da48c94bfcffb97775b8376b (patch) | |
| tree | 4358036c369dc22aa8bf823cd16b1b22c1d5809e /Makefile | |
| parent | 01a3740f9655cdc25748a12b394d6de5e88c8e01 (diff) | |
| parent | 2bf0496332132cb456930e2e37395a91268e23ba (diff) | |
Merge branch 'master' into nonedit
Conflicts (manually resolved):
ikiwiki.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 |