diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 14:24:38 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 14:24:38 +0200 |
| commit | 207ac2343b5dd658f3d380dd92d1260fb2135b43 (patch) | |
| tree | db36e1159897da3b8ae26a21b9599a7f9d5e55ee | |
| parent | 84548401b3eb8275ed764926c593c148cf50043c (diff) | |
| parent | e595e37450ff6c0971924f3e7b461febe4fd1ebb (diff) | |
Merge branch 'master' into nonedit
Conflicts (manually resolved):
Makefile
| -rw-r--r-- | Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -1,13 +1,19 @@ SOURCES = ikiwiki +# Git origin (with capital MOULE replaced or stripped as needed) 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 +# flavors used. Expands Git BRANCHes ikiwiki_basewiki_FLAVORS = nonedit ikiwiki_templates_FLAVORS = nonedit -ikiwiki_POMODULES = basewiki smiley -ikiwiki_BRANCH = master-FLAVOR-LOCALE +# locales used. Expands Git BRANCHes #ikiwiki_LOCALES = da nb -ikiwiki_POLOCALES = da +# gettext-based modules and locales used +#ikiwiki_POMODULES = basewiki smiley +#ikiwiki_POLOCALES = da dummy_MODULES = content_dummy |