From 1bbb053f70fb006c6b68a29dcbf35bf469d2a929 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Mon, 8 Jul 2019 16:03:52 +0100
Subject: [PATCH] [misc] update ChangeLog for BETA

---
 ChangeLog.txt | 14 ++++++++++++++
 src/db.h      |  1 +
 src/rufus.rc  | 10 +++++-----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a5cfd6ef..94979196 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,17 @@
+o Version 3.6 (2019.07.??)
+    Add support for persistent partitions [EXPERIMENTAL]
+    (Note: The above won't work with Ubuntu until Ubuntu bug #1489855 is fixed)
+    Add a mode to use VHD when partitioning/formatting (Alt-V) [EXPERIMENTAL]
+    Add full extraction support for efi.img (Solus)
+    Fix listing of blocking processes
+    Fix NTFS not being selectable when using Grub4DOS
+    Fix download script not running when the username contains a space
+    Fix translated messages potentially being truncated (e.g. Thai)
+    Fix progress bar report for screen readers (Accessibility)
+    Improve(?) Windows To Go support by following Microsoft recommended partition order
+    Disable ISO mode when Manjaro ISOHybrids are being used
+    Update embedded GRUB to version 2.04
+
 o Version 3.5 (2019.03.28)
     Add a feature to download official retail Windows 8.1 or Windows 10 ISOs
     (Note: 'Check for updates' must be enabled for the above to be active)
diff --git a/src/db.h b/src/db.h
index 0102dbee..b878f670 100644
--- a/src/db.h
+++ b/src/db.h
@@ -88,6 +88,7 @@ static uint8_t sha256db[] = {
 	0xb3, 0xa8, 0xf2, 0x12, 0x89, 0x1c, 0xd2, 0x6e, 0x1a, 0xb4, 0x4a, 0xa8, 0x59, 0x8f, 0x6e, 0x64, 0xc6, 0x83, 0x19, 0x8d, 0x43, 0x00, 0x27, 0x54, 0xec, 0xbd, 0x8a, 0x78, 0xf2, 0xd0, 0xc0, 0x0b, // syslinux-6.03/pre8/ldlinux.sys
 	0xb3, 0xdc, 0x31, 0x79, 0xf6, 0x2b, 0x20, 0x51, 0xc9, 0x43, 0xe5, 0x2e, 0xeb, 0xf2, 0x29, 0x8a, 0xa4, 0x7e, 0x7c, 0x0a, 0x97, 0x78, 0xe8, 0x62, 0x77, 0xa7, 0x48, 0x2a, 0x27, 0x0a, 0x7a, 0x8e, // syslinux-6.01/ldlinux.bss
 	0xb4, 0x6a, 0xf2, 0x09, 0x19, 0xe9, 0xf2, 0x1f, 0xa1, 0x52, 0x37, 0x5d, 0xda, 0xc4, 0x58, 0x87, 0x08, 0xc1, 0x22, 0xb3, 0x65, 0x7f, 0x09, 0x01, 0x31, 0x4e, 0x83, 0x45, 0x49, 0xa9, 0x6c, 0xe7, // syslinux-4.07/menu.c32
+	0xbc, 0x3f, 0xb7, 0x6d, 0xbc, 0xd6, 0x32, 0x37, 0xc3, 0x68, 0x8d, 0x3b, 0x55, 0x3c, 0x99, 0x41, 0x0e, 0x8f, 0xb3, 0x9e, 0x52, 0x00, 0x9d, 0xdc, 0xeb, 0xb8, 0x8e, 0xe7, 0xd2, 0x5a, 0xec, 0xa8, // grub-2.03.5/core.img
 	0xbf, 0xf9, 0xc5, 0x89, 0x59, 0x70, 0x4d, 0x1e, 0xbe, 0x25, 0xb4, 0x43, 0xc8, 0x92, 0x3a, 0x42, 0xed, 0x89, 0xaf, 0x8b, 0xd2, 0x92, 0xe7, 0xd7, 0xcb, 0xeb, 0xca, 0xcc, 0xc0, 0x7c, 0xc7, 0x19, // syslinux-5.11/ldlinux.sys
 	0xc3, 0x3b, 0x31, 0x5f, 0xec, 0xe4, 0xad, 0xc4, 0xc3, 0xb2, 0x75, 0x13, 0x22, 0x84, 0x66, 0xe4, 0x44, 0x99, 0xcd, 0xa7, 0xfd, 0x63, 0x97, 0xc5, 0xab, 0xe0, 0xf8, 0xce, 0x4f, 0xe3, 0x45, 0x39, // syslinux-5.10/ldlinux.c32
 	0xc8, 0xe5, 0x05, 0x6d, 0xfd, 0xf2, 0xc5, 0xf2, 0x1a, 0xd0, 0xee, 0x41, 0x0a, 0xf9, 0xf4, 0x15, 0x51, 0x89, 0xdf, 0x88, 0x6e, 0x88, 0x4d, 0xdd, 0xe7, 0x3e, 0x48, 0x0f, 0x56, 0x9a, 0x00, 0xc6, // grub4dos-0.4.6a/grldr
diff --git a/src/rufus.rc b/src/rufus.rc
index 85f8779a..a848ab82 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.6.1546"
+CAPTION "Rufus 3.6.1547"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -394,8 +394,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,1546,0
- PRODUCTVERSION 3,6,1546,0
+ FILEVERSION 3,6,1547,0
+ PRODUCTVERSION 3,6,1547,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -413,13 +413,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.6.1546"
+            VALUE "FileVersion", "3.6.1547"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.6.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.6.1546"
+            VALUE "ProductVersion", "3.6.1547"
         END
     END
     BLOCK "VarFileInfo"