From 59218e28d081f353b7b1acf9f689c2e09acf0c1b Mon Sep 17 00:00:00 2001
From: Stephan Dilly <dilly.stephan@gmail.com>
Date: Mon, 7 Sep 2015 15:28:06 +0200
Subject: [PATCH] update visual studio project (VS2015) and imgui to version
 where version number is correctly set

---
 .gitignore            | 2 ++
 cimgui/cimgui.vcxproj | 6 +++---
 imgui                 | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 911978f..0cecdb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,5 @@ cimgui/cimgui.v12.suo
 cimgui/Release/
 .idea
 CMakeLists.txt
+cimgui/.vs/
+cimgui/cimgui.vcxproj.user
diff --git a/cimgui/cimgui.vcxproj b/cimgui/cimgui.vcxproj
index f8a8364..a33061a 100644
--- a/cimgui/cimgui.vcxproj
+++ b/cimgui/cimgui.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,13 +19,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/imgui b/imgui
index 77bcb71..c9e19f8 160000
--- a/imgui
+++ b/imgui
@@ -1 +1 @@
-Subproject commit 77bcb7152ba73e88e8ebe91f6b140b783c399898
+Subproject commit c9e19f8953b0b21ecfd6a5bcdaca38c45eb59057