Merge branch '1.2.0-dev' into 'master'

Move the version to 1.2.0-dev Just marking this as 1.2.0-dev See merge request !98
CZ-NIC · Dec 14, 2016 · d210747 · d210747
2 parents 59d5adf + 68535b7
commit d210747
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/config.mk b/config.mk
@@ -1,12 +1,13 @@
 # Project
 MAJOR := 1
-MINOR := 1
-PATCH := 1
+MINOR := 2
+PATCH := 0
+EXTRA := -dev
 ABIVER := 2
 BUILDMODE := dynamic
 HARDENING := yes
 
-VERSION := $(MAJOR).$(MINOR).$(PATCH)
+VERSION := $(MAJOR).$(MINOR).$(PATCH)$(EXTRA)
 
 # Paths
 PREFIX ?= /usr/local