diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:44:00 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 14:47:07 +0200 |
| commit | b4b490324165d7177199034316ef3bc76be362dd (patch) | |
| tree | 2684d494cff7e9332d2d8025d70b7a345139a22a /Makefile | |
| parent | c67700c46dd282879dcccf1db2eb77ad22055401 (diff) | |
| parent | ba197084b657f202d1e81424b8fdf71e191f6749 (diff) | |
Merge branch 'master' into _da
Conflicts (manually resolved):
ikiwiki_da.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 |