From 1152dff251fb399e8cb8f15373acded6790e1b86 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 13 Jul 2008 11:43:43 +0200 Subject: Drop non-Git VCS options from config. Use clean content branches. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fd39a38..6f93950 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 = clean-LOCALE ikiwiki_LOCALES = da no_NB ikiwiki_POLOCALES = da -- cgit v1.2.3 From d86dfb9332bb1067cbf15fe2c0bc0a67bea5f605 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 10 Aug 2008 17:22:02 +0200 Subject: Revert to master branch (to ease merging). --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9082822..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 = clean-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 From 977f639127cb491dfbbe3125ab5eab533f4d1854 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 10 Aug 2008 17:24:13 +0200 Subject: Change (again) to clean branch. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4f3fe1e..9082822 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 -- cgit v1.2.3