diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:46:41 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 19:47:40 +0200 |
| commit | a3a014542bddda8ba54f45078232cceeadfa505b (patch) | |
| tree | 9cc54a88d5b57212b420625417f085d0706e4cbb /Makefile | |
| parent | 732fe48592a0f89c572c19f87314f43f6502bcb7 (diff) | |
| parent | 845babe7307e76ce905d45dd74a14dcd3d67cecb (diff) | |
Merge branch 'nb' into _multilang
Conflicts (manually resolve):
Makefile
basewiki
ikiwiki_nb.setup
templates
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4,7 +4,7 @@ ikiwiki_VERSION = 3.20100704 # modules (subproject extension names) used. Expands SOURCES ikiwiki_MODULES = templates basewiki smiley directives # locales used. Expands SOURCES -ikiwiki_LOCALES = da +ikiwiki_LOCALES = da nb # gettext-based modules and locales used #ikiwiki_POMODULES = basewiki smiley directives #ikiwiki_POLOCALES = da @@ -12,7 +12,7 @@ ikiwiki_LOCALES = da #dummy_MODULES = content_dummy # uncomment this when ikiwiki.setup is configured for the local environment -#CONFIGS = ikiwiki.setup +#CONFIGS = ikiwiki_da.setup ikiwiki_nb.setup ikiwiki.setup # Everything after this is generic |