From b180e92b4c32d3a587a3470b2399ca2e4907da8a Mon Sep 17 00:00:00 2001
From: PKEuS <philipp.kloke@web.de>
Date: Sat, 30 Mar 2013 19:04:01 +0100
Subject: [PATCH] Set version to 1.60 dev Use WiX 3.7

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

diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
index b0260a21a..2202cb053 100644
--- a/lib/cppcheck.cpp
+++ b/lib/cppcheck.cpp
@@ -34,7 +34,7 @@
 #include <pcre.h>
 #endif
 
-static const char Version[] = "1.59";
+static const char Version[] = "1.60 dev";
 static const char ExtraVersion[] = "";
 
 static TimerResults S_timerResults;
diff --git a/lib/version.h b/lib/version.h
index a1f163d1a..3ccb24cbd 100644
--- a/lib/version.h
+++ b/lib/version.h
@@ -1,3 +1,3 @@
-#define CPPCHECK_VERSION_STRING "1.59"
-#define CPPCHECK_VERSION 1,59,0,0
+#define CPPCHECK_VERSION_STRING "1.60"
+#define CPPCHECK_VERSION 1,59,99,0
 #define LEGALCOPYRIGHT L"Copyright (C) 2007-2013 Daniel Marjam\x00E4ki and Cppcheck team."
diff --git a/man/manual.docbook b/man/manual.docbook
index ebe25b4a3..b5f895965 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.59</title>
+    <title>Cppcheck 1.60 dev</title>
 
     <date>2013-01-12</date>
   </bookinfo>
diff --git a/win_installer/cppcheck.wixproj b/win_installer/cppcheck.wixproj
index 2aed43cfb..56e4205cf 100644
--- a/win_installer/cppcheck.wixproj
+++ b/win_installer/cppcheck.wixproj
@@ -2,7 +2,7 @@
 <Project DefaultTargets="All" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
     <DefineSolutionProperties>false</DefineSolutionProperties>
-    <WixToolPath Condition="'$(WixToolPath)' == ''">$(PROGRAMFILES)\WiX Toolset v3.6\bin\</WixToolPath>
+    <WixToolPath Condition="'$(WixToolPath)' == ''">$(PROGRAMFILES)\WiX Toolset v3.7\bin\</WixToolPath>
     <WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
 
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index 930263268..13f43c45f 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.59" ?>
+  <?define ProductName = "Cppcheck 1.60 dev" ?>
   <?define ProductNameShort = "Cppcheck" ?>
-  <?define ProductVersion = "1.59" ?>
+  <?define ProductVersion = "1.59.99" ?>
 
   <?define ProductManufacturer = "The Cppcheck team" ?>
   <?define ProductDescription = "Cppcheck is a tool for static analysis of C/C++ code" ?>