diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 15:35:56 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 15:35:56 +0200 |
commit | ebc6e1072b80603cbf65cc5f9902ad306742f858 (patch) | |
tree | 22f19d746b5bbf0dade789c9e238a654ec9ba7d7 /Makefile | |
parent | 6428160b3c7aefed77a442fc94dcf2f2eb2ffc4b (diff) | |
parent | 7bd063bd9ccc65ccacbcd1900fcd183c7c129b3d (diff) |
Merge branch '_scs' into scs
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 = scs-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 |