From fb76561b096669ab974c07d27546caddcbc70f63 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Fri, 11 Nov 2011 09:35:42 +0100
Subject: [PATCH] Set version to 1.2dev to reflect we're in the 1.2 branch.

---
 configure.in   | 2 +-
 src/suricata.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 45cade8ea3..4d21e0e23e 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@
 AC_INIT(configure.in)
 
     AM_CONFIG_HEADER(config.h)
-    AM_INIT_AUTOMAKE(suricata, 1.1)
+    AM_INIT_AUTOMAKE(suricata, 1.2dev)
 
     AC_LANG_C
     AC_PROG_CC_C99
diff --git a/src/suricata.h b/src/suricata.h
index 530c6d9116..6f94f746f5 100644
--- a/src/suricata.h
+++ b/src/suricata.h
@@ -71,7 +71,7 @@
 
 /* the name of our binary */
 #define PROG_NAME "Suricata"
-#define PROG_VER "1.1"
+#define PROG_VER "1.2dev"
 
 /* runtime engine control flags */
 #define SURICATA_STOP    0x01   /**< gracefully stop the engine: process all