Permalink
Browse files

Branching 3.2/3.3

  • Loading branch information...
1 parent 4f7079a commit 8a844d35f693d47165612ac0cd2d17fa5484529a @fupjack fupjack committed Oct 9, 2012
Showing with 5 additions and 3 deletions.
  1. +1 −1 sys/conf/newvers.sh
  2. +4 −2 sys/sys/param.h
View
@@ -44,7 +44,7 @@ fi
# Set the branch
#
-BRANCH="DEVELOPMENT_3_1"
+BRANCH="DEVELOPMENT_3_3"
TYPE="DragonFly"
View
@@ -91,9 +91,11 @@
* 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>

0 comments on commit 8a844d3

Please sign in to comment.