diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 22:43:15 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-10 22:43:15 +0200 |
commit | 27c6ea3a4bd2aabe2ee2e6143ad299b8faa341dc (patch) | |
tree | 5594e505269c30fc668aa3e1fef06ff437cd5420 /Makefile | |
parent | 25f3b40fb7ebe138278356a8f7181e10e2394ef0 (diff) | |
parent | 977f639127cb491dfbbe3125ab5eab533f4d1854 (diff) |
Merge branch 'clean' into allinone-da
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3,7 +3,7 @@ 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 +ikiwiki_BRANCH = clean-FLAVOR-LOCALE # modules (subproject extension names) used. Expands Git ORIGINs ikiwiki_MODULES = templates basewiki smiley # flavors used. Expands Git BRANCHes |