From 88e307b6bd7169500496575be54f53e0a5930c1f Mon Sep 17 00:00:00 2001
From: cbucher <christophe.bucher@laposte.net>
Date: Fri, 17 Feb 2017 21:42:43 +0100
Subject: [PATCH] version 1.18.0.17048

---
 Console/Console.vcxproj.filters | 54 ++++++++++++++++-----------------
 README.md                       |  3 +-
 shared/version.h                |  8 ++---
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/Console/Console.vcxproj.filters b/Console/Console.vcxproj.filters
index 78e02d48..0d453912 100644
--- a/Console/Console.vcxproj.filters
+++ b/Console/Console.vcxproj.filters
@@ -60,12 +60,6 @@
     <ClCompile Include="MainFrame.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PageSettingsTabs1.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PageSettingsTabs2.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="SelectionHandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -84,12 +78,6 @@
     <ClCompile Include="Wallpaper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="PageSettingsTabsColors.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PageSettingsTabsEnv.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Snippet.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -132,6 +120,18 @@
     <ClCompile Include="DlgSettingsControls.cpp">
       <Filter>Source Files\DlgSettings</Filter>
     </ClCompile>
+    <ClCompile Include="PageSettingsTabs1.cpp">
+      <Filter>Source Files\DlgSettings</Filter>
+    </ClCompile>
+    <ClCompile Include="PageSettingsTabs2.cpp">
+      <Filter>Source Files\DlgSettings</Filter>
+    </ClCompile>
+    <ClCompile Include="PageSettingsTabsColors.cpp">
+      <Filter>Source Files\DlgSettings</Filter>
+    </ClCompile>
+    <ClCompile Include="PageSettingsTabsEnv.cpp">
+      <Filter>Source Files\DlgSettings</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="AboutDlg.h">
@@ -176,12 +176,6 @@
     <ClInclude Include="MainFrame.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PageSettingsTabs1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PageSettingsTabs2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -203,12 +197,6 @@
     <ClInclude Include="Wallpaper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="PageSettingsTab.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="PageSettingsTabsColors.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\shared\Cpp11Helpers.h">
       <Filter>Header Files\shared</Filter>
     </ClInclude>
@@ -233,9 +221,6 @@
     <ClInclude Include="AeroTabCtrl.h">
       <Filter>Header Files\GUI custom</Filter>
     </ClInclude>
-    <ClInclude Include="PageSettingsTabsEnv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="wtlaero.h">
       <Filter>Header Files\GUI custom</Filter>
     </ClInclude>
@@ -299,6 +284,21 @@
     <ClInclude Include="DlgSettingsControls.h">
       <Filter>Header Files\DlgSettings</Filter>
     </ClInclude>
+    <ClInclude Include="PageSettingsTab.h">
+      <Filter>Header Files\DlgSettings</Filter>
+    </ClInclude>
+    <ClInclude Include="PageSettingsTabs1.h">
+      <Filter>Header Files\DlgSettings</Filter>
+    </ClInclude>
+    <ClInclude Include="PageSettingsTabs2.h">
+      <Filter>Header Files\DlgSettings</Filter>
+    </ClInclude>
+    <ClInclude Include="PageSettingsTabsColors.h">
+      <Filter>Header Files\DlgSettings</Filter>
+    </ClInclude>
+    <ClInclude Include="PageSettingsTabsEnv.h">
+      <Filter>Header Files\DlgSettings</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\Console.ico">
diff --git a/README.md b/README.md
index c788f0c3..94de92b7 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Changelog
     + added
     * fixed
 
-Changes in 1.18.0 experimental (09 Feb 2017)
+Changes in 1.18.0 (17 Feb 2017)
 
     ! Update tab title current directory in realtime.
     ! Renaming a tab title to empty is no longer allowed
@@ -57,6 +57,7 @@ Changes in 1.18.0 experimental (09 Feb 2017)
     * GDI leaks (thanks to char101).
     * Allow choosing environment variables inheritage method.
     * Improve Windows 10 glass transparency.
+    * PowerShell progress bar is fixed on Windows 10.
 
 Changes in 1.17.2 (18 Nov 2016)
 
diff --git a/shared/version.h b/shared/version.h
index f7ba507e..66a5c234 100644
--- a/shared/version.h
+++ b/shared/version.h
@@ -3,13 +3,13 @@
 #define VERSION_MAJOR     1
 #define VERSION_MINOR     18
 #define VERSION_BUILD     0
-#define VERSION_BUILD2    17041
-#define VERSION_FILE      "1.18.0.17041"
-#define VERSION_PRODUCT   "1.18.0.17041 beta0"
+#define VERSION_BUILD2    17048
+#define VERSION_FILE      "1.18.0.17048"
+#define VERSION_PRODUCT   "1.18.0.17048"
 #define VERSION_COPYRIGHT "Copyright (C) 2011-2017 Bucher Christophe"
 
 #ifndef _WIN32
 
-VERSION = 1.18.0.17041
+VERSION = 1.18.0.17048
 
 #endif