summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-10 22:43:15 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-10 22:43:15 +0200
commit27c6ea3a4bd2aabe2ee2e6143ad299b8faa341dc (patch)
tree5594e505269c30fc668aa3e1fef06ff437cd5420 /Makefile
parent25f3b40fb7ebe138278356a8f7181e10e2394ef0 (diff)
parent977f639127cb491dfbbe3125ab5eab533f4d1854 (diff)
Merge branch 'clean' into allinone-da
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 274e0ca..24e1940 100644
--- a/Makefile
+++ b/Makefile
@@ -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