From fb11a19403a651bf3230cebdc28130a0c49fd0c4 Mon Sep 17 00:00:00 2001 From: "Justin C. Sherrill" Date: Mon, 3 Oct 2011 19:47:30 -0700 Subject: [PATCH] 2.12 branch. --- sys/conf/newvers.sh | 2 +- sys/sys/param.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 8f1157ab3a..48e01cec64 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -44,7 +44,7 @@ fi # Set the branch # -BRANCH="DEVELOPMENT_2_11" +BRANCH="RELEASE_2_12" TYPE="DragonFly" diff --git a/sys/sys/param.h b/sys/sys/param.h index 13fce9b224..83f1dc98dd 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -79,9 +79,11 @@ * 200902 - Xerox NS protocol removal * 201000 - 2.10 release * 201100 - 2.11 master + * 201200 - 2.12 release + * 201300 - 2.13 master */ #undef __DragonFly_version -#define __DragonFly_version 201100 /* propagated to newvers */ +#define __DragonFly_version 201200 /* propagated to newvers */ #include -- 2.41.0