From 2ff001de4033432b5bf4ef13e985909e7fcb60cd Mon Sep 17 00:00:00 2001
From: tomcw <tomcw@users.noreply.github.com>
Date: Wed, 20 Dec 2017 20:52:50 +0000
Subject: [PATCH] Bump to 1.26.3.6 and update History.txt

---
 bin/History.txt      | 12 ++++++++++--
 resource/Applewin.rc |  8 ++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/bin/History.txt b/bin/History.txt
index 4b195e0a..a656ece5 100644
--- a/bin/History.txt
+++ b/bin/History.txt
@@ -9,8 +9,8 @@ https://github.com/AppleWin/AppleWin/issues/new
 Tom Charlesworth
 
 
-1.26.3.5 (Experimental) - 4 Dec 2017
-------------------------------------
+1.26.3.6 (Experimental) - 20 Dec 2017
+-------------------------------------
 Changes:
 . [Bug #504] Full-screen: hide mouse pointer after 2 seconds of inactivity (and show again if mouse is moved)
 . [Bug #469] New -no-printscreen-key switch to prevent the PrintScreen key from being registered.
@@ -19,11 +19,17 @@ Changes:
     - nnnn: select a specific resolution with height=nnnn pixels
     Use to select a better resolution for full-screen mode.
     NB. This changes the display resolution (and restores on exit).
+. [Bug #477] Help doc: Document behaviour full-speed mode
 . [Bug #428] Input option to use PC Joystick 1 Thumbstick 2 for emulated Joystick 2 
 . Swapping disks while a drive is on now warns and prompts if you still wish to do this instead of silently failing with no feedback.
 . [Bug #323] Skip hard disk boot by holding down the Open-Apple key during an Apple II restart
 . [Bug #224] Added Config checkbox for 'Full-Screen: Show drive/keyboard status'
 . [PR #441] Update zlib to latest version 1.2.11
+. [PR #275] Attenuate speaker (and 8-bit DAC) output sample after 0.25s of inactivity
+. [Bug #483] Debugger: Shift+Left mouse button to toggle 6502 Status flag bits
+. [Bug #479, #476, #473] Debugger: Various UI and other fixes
+. [Bug #462] Debugger: Changed Left mouse button (LMB) to Shift+LMB to toggle display items
+. [Bug #406] Debugger: Support LC and MMU status & updated Help doc
 
 Fixes:
 . [Bug #516] Internal video-mode was having PAGE2 permanently cleared (instead of just masked) when 80STORE was set.
@@ -33,6 +39,7 @@ Fixes:
 . [Bug #492] UI fixes for full-screen & 2x windowed-mode
 . [Bug #486] Peripheral card's expansion ROM ($C800-CFFF, eg. SSC) wasn't being correctly restored from a save-state
   - Resulting in regression: Mousecard crash to monitor (#495).
+. [Bug #484] Debugger: Some corrections to APPLE2E.SYM
 . [Bug #464] Fix for full-screen: bottom line missing when vertical resolution is 768
 . [Bug #460] Debugger: F2 whilst debugger active will immediately stop the drive spinning (allowing disk swap)
 . [Bug #456] Fix strange speaker clicks when changing configuration - DirectSound wasn't being uninitialised on a restart
@@ -58,6 +65,7 @@ Fixes:
   - Experimental support for 6551's status bits: DCD and DSR via -dcd and -dsr switches
 . [Bug #383] "Enhanced disk speed" is very slow when debugger is active
 . [Bug #320] Mockingboard/Phasor: support 'inactive' function like real hardware
+. [Bug #308] SSC ACIA Status register's interrupt bit not set when IRQ enabled and using TCP Port 1977
 . [Bug #269] When stepping, ESC no longer exits back to debugger (use F7, Pause keys or Debugger button instead).
 . [Bug #250] Debugger: When MODE_STEPPING, fix issue with disk LEDs staying on
 . [Bug #217] Debugger G(o) command should use normal speed
diff --git a/resource/Applewin.rc b/resource/Applewin.rc
index 941a797c..6fdc92f3 100644
--- a/resource/Applewin.rc
+++ b/resource/Applewin.rc
@@ -252,8 +252,8 @@ DISK_ICON               ICON                    "DISK.ICO"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,26,3,5
- PRODUCTVERSION 1,26,3,5
+ FILEVERSION 1,26,3,6
+ PRODUCTVERSION 1,26,3,6
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -271,12 +271,12 @@ BEGIN
             VALUE "Comments", "https://github.com/AppleWin"
             VALUE "CompanyName", "AppleWin"
             VALUE "FileDescription", "Apple //e Emulator for Windows"
-            VALUE "FileVersion", "1, 26, 3, 5"
+            VALUE "FileVersion", "1, 26, 3, 6"
             VALUE "InternalName", "APPLEWIN"
             VALUE "LegalCopyright", " 1994-2017 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis"
             VALUE "OriginalFilename", "APPLEWIN.EXE"
             VALUE "ProductName", "Apple //e Emulator"
-            VALUE "ProductVersion", "1, 26, 3, 5"
+            VALUE "ProductVersion", "1, 26, 3, 6"
         END
     END
     BLOCK "VarFileInfo"