diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 12:59:52 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 12:59:52 +0200 |
| commit | c391c098a1b19b0e8709c0d83ec9de2de2f8da7f (patch) | |
| tree | f0719104fb9308335710137a7d0c4eb6ffe0f1f5 /Makefile | |
| parent | 044a45920bf1e5c509bd924e2e35ee7e1b9f23f8 (diff) | |
| parent | 4b7c6e85f816bee9b1ba41f92ba6039add137e25 (diff) | |
Merge branch 'master' into scs
Conflicts (manually resolved):
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2,11 +2,11 @@ SOURCES = ikiwiki ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE ikiwiki_MODULES = templates basewiki smiley -ikiwiki_basewiki_FLAVORS = nonedit -ikiwiki_templates_FLAVORS = nonedit +#ikiwiki_basewiki_FLAVORS = nonedit +#ikiwiki_templates_FLAVORS = nonedit ikiwiki_POMODULES = basewiki smiley ikiwiki_BRANCH = scs-FLAVOR-LOCALE -ikiwiki_LOCALES = da nb +#ikiwiki_LOCALES = da nb ikiwiki_POLOCALES = da #dummy_MODULES = content_dummy |