From 55f68535b22ffdf8720ea856df0f10cf186e0fba Mon Sep 17 00:00:00 2001
From: PKEuS <philipp.kloke@web.de>
Date: Sat, 4 Jan 2014 10:41:13 +0100
Subject: [PATCH] Set version to "1.64 dev"/1.63.99. Use version.h in
 cppcheck.cpp.

---
 cli/main.cpp                  | 2 +-
 lib/cppcheck.cpp              | 3 ++-
 lib/version.h                 | 6 +++---
 man/manual.docbook            | 2 +-
 win_installer/productInfo.wxi | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cli/main.cpp b/cli/main.cpp
index 5b09ad431..c63fb3234 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -20,7 +20,7 @@
 /**
  *
  * @mainpage Cppcheck
- * @version 1.63
+ * @version 1.63.99
  *
  * @section overview_sec Overview
  * Cppcheck is a simple tool for static analysis of C/C++ code.
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index 05e86d807..299dab0d8 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -28,13 +28,14 @@
 #include <sstream>
 #include <stdexcept>
 #include "timer.h"
+#include "version.h"
 
 #ifdef HAVE_RULES
 #define PCRE_STATIC
 #include <pcre.h>
 #endif
 
-static const char Version[] = "1.63";
+static const char Version[] = CPPCHECK_VERSION_STRING;
 static const char ExtraVersion[] = "";
 
 static TimerResults S_timerResults;
diff --git a/lib/version.h b/lib/version.h
index b7883c62b..0a05c6b36 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -1,3 +1,3 @@
-#define CPPCHECK_VERSION_STRING "1.63"
-#define CPPCHECK_VERSION 1,63,0,0
-#define LEGALCOPYRIGHT L"Copyright (C) 2007-2013 Daniel Marjam\x00E4ki and Cppcheck team."
+#define CPPCHECK_VERSION_STRING "1.64 dev"
+#define CPPCHECK_VERSION 1,63,99,0
+#define LEGALCOPYRIGHT L"Copyright (C) 2007-2014 Daniel Marjam\x00E4ki and Cppcheck team."
diff --git a/man/manual.docbook b/man/manual.docbook
index ca54a2723..70c7240e2 100644
--- a/man/manual.docbook
+++ b/man/manual.docbook
@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
 <book>
   <bookinfo>
-    <title>Cppcheck 1.63</title>
+    <title>Cppcheck 1.64 dev</title>
 
     <date>2013-12-23</date>
   </bookinfo>
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index ba3feaddf..efbf16913 100644
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
-  <?define ProductName = "Cppcheck 1.63" ?>
+  <?define ProductName = "Cppcheck 1.64 dev" ?>
   <?define ProductNameShort = "Cppcheck" ?>
-  <?define ProductVersion = "1.63" ?>
+  <?define ProductVersion = "1.63.99" ?>
 
   <?define ProductManufacturer = "The Cppcheck team" ?>
   <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>