Branching 3.2/3.3 v3.3.0
authorJustin C. Sherrill <justin@shiningsilence.com>
Tue, 9 Oct 2012 03:25:57 +0000 (23:25 -0400)
committerJustin C. Sherrill <justin@shiningsilence.com>
Tue, 9 Oct 2012 03:25:57 +0000 (23:25 -0400)
sys/conf/newvers.sh
sys/sys/param.h

index 100f0bb..744a7fb 100644 (file)
@@ -44,7 +44,7 @@ fi
 
 # Set the branch
 #
-BRANCH="DEVELOPMENT_3_1"
+BRANCH="DEVELOPMENT_3_3"
 
 TYPE="DragonFly"
 
index f15d0a0..563748c 100644 (file)
  * 300101 - i4b (ISDN) removal
  * 300102 - <sys/ata.h> is now just a link of <sys/nata.h>
  * 300103 - if SIG_IGN is set on SIGCHLD, do not keep zombie children
- */
+ * 300200 - 3.2 release
+ * 300300 - 3.3 master
+*/
 #undef __DragonFly_version
-#define __DragonFly_version 300103     /* propagated to newvers */
+#define __DragonFly_version 300300     /* propagated to newvers */
 
 #include <sys/_null.h>