From 9ef4df6f1fdf6db2fd411529a27779ce31cdbd1f Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Thu, 10 Dec 2015 12:43:22 +0000
Subject: [PATCH] [misc] update Changelog for 2.6

---
 ChangeLog.txt |  8 ++++++++
 src/rufus.rc  | 10 +++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b7d7d524..12c38c1e 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,11 @@
+o Version 2.6 (2015.12.??)
+    Add Serbian (Latin) translation, courtesy of Ivan Strugar
+    Add a cheat mode to zero a device (Alt-Z)
+    Fix dual BIOS/UEFI mode not being disabled once enabled (Alt-E)
+    Fix a crash when Syslinux downloaded files are modified by a firewall
+    Fix FAT32 not being disabled for Windows ISOs in BIOS/CSM mode
+    Additional translation updates
+
 o Version 2.5 (2015.10.26)
     Add SHA-256 checksum verification
     Add a cheat mode to disable exclusive USB drive locking (Alt-,)
diff --git a/src/rufus.rc b/src/rufus.rc
index 83f5ed7c..4f161686 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 2.6.814"
+CAPTION "Rufus 2.6.815"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -319,8 +319,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,6,814,0
- PRODUCTVERSION 2,6,814,0
+ FILEVERSION 2,6,815,0
+ PRODUCTVERSION 2,6,815,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -337,13 +337,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.6.814"
+            VALUE "FileVersion", "2.6.815"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.6.814"
+            VALUE "ProductVersion", "2.6.815"
         END
     END
     BLOCK "VarFileInfo"