From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Sun, 28 Mar 2010 22:56:27 +0000 (-0700)
Subject: release - Branch for 2.6, adjust sys/sys/param.h and sys/conf/newvers.sh
X-Git-Tag: v2.6.0^0
X-Git-Url: http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/a1cad5e7e1310c1b4b2012b5e38b226fa734a4c9

release - Branch for 2.6, adjust sys/sys/param.h and sys/conf/newvers.sh
---

diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 4110ede..ed75464 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@ fi
 
 # Set the branch
 #
-BRANCH="DEVELOPMENT_2_5"
+BRANCH="RELEASE_2_6"
 
 TYPE="DragonFly"
 
diff --git a/sys/sys/param.h b/sys/sys/param.h
index bad9045..5eb5a74 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -71,9 +71,11 @@
  * 200206 - *sleep() renames
  * 200400 - 2.4 branch
  * 200500 - 2.5 master
+ * 200600 - 2.6 branch
+ * 200700 - 2.7 master
  */
 #undef __DragonFly_version
-#define __DragonFly_version 200500	/* Master, propagated to newvers */
+#define __DragonFly_version 200600	/* propagated to newvers */
 
 #ifdef __FreeBSD__
 /*