From a79791cb817bd74ad45be270107b7accfd95faee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 1 May 2015 18:51:33 +0200
Subject: [PATCH] 1.69: Set versions

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

diff --git a/cli/main.cpp b/cli/main.cpp
index f5f429c43..d86d6e89b 100644
--- a/cli/main.cpp
+++ b/cli/main.cpp
@@ -20,7 +20,7 @@
 /**
  *
  * @mainpage Cppcheck
- * @version 1.68.99
+ * @version 1.69
  *
  * @section overview_sec Overview
  * Cppcheck is a simple tool for static analysis of C/C++ code.
diff --git a/lib/version.h b/lib/version.h
index 98303325c..2141a0231 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -1,5 +1,5 @@
 #define CPPCHECK_MAJOR 1
-#define CPPCHECK_MINOR 68
+#define CPPCHECK_MINOR 69
 #define CPPCHECK_DEVMINOR 69
 
 #define STRINGIFY(x) STRING(x)
diff --git a/man/manual.docbook b/man/manual.docbook
index c4b65fa65..221b2d24a 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.69 dev</title>
+    <title>Cppcheck 1.69</title>
 
     <date>2015-01-03</date>
   </bookinfo>
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index 5e6e12bfc..fc8ac34ad 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.69 dev" ?>
+  <?define ProductName = "Cppcheck 1.69" ?>
   <?define ProductNameShort = "Cppcheck" ?>
-  <?define ProductVersion = "1.68.99" ?>
+  <?define ProductVersion = "1.69" ?>
 
   <?define ProductManufacturer = "The Cppcheck team" ?>
   <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>