From a2d2aa9fed2cf4bb3e98bd3ccc56a64a0ce6db13 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 2 Aug 2008 01:01:27 +0200 Subject: Set scs branch in Makefile. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fd39a38..de0c770 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ SOURCES = ikiwiki ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE ikiwiki_MODULES = templates basewiki smiley ikiwiki_POMODULES = basewiki smiley -ikiwiki_BRANCH = master-LOCALE +ikiwiki_BRANCH = scs-LOCALE ikiwiki_LOCALES = da no_NB ikiwiki_POLOCALES = da -- cgit v1.2.3 From 5ccc04374652fe8040c2bbcfd1a38a03d3952045 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 10 Aug 2008 17:25:36 +0200 Subject: Revert to master branch (to ease merging). --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 52fc8f1..4f3fe1e 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 = scs-FLAVOR-LOCALE +ikiwiki_BRANCH = master-FLAVOR-LOCALE # modules (subproject extension names) used. Expands Git ORIGINs ikiwiki_MODULES = templates basewiki smiley # flavors used. Expands Git BRANCHes -- cgit v1.2.3