summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md1
-rw-r--r--README.md8
-rw-r--r--ReleaseNotes/ReleaseNotes.txt6
3 files changed, 10 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc5baab5e..f1879cad5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,3 @@
-core: fix crashes when using user space FTDI driver
mobile: add information about the cloud sync state to the Subsurface plate in the menu
---
diff --git a/README.md b/README.md
index 1dfa03b8b..684c09478 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
# Subsurface [![Build Status](https://travis-ci.org/Subsurface-divelog/subsurface.svg?branch=master)](https://travis-ci.org/Subsurface-divelog/subsurface)
-This is the README file for Subsurface 4.9.5
+This is the README file for Subsurface 4.9.6
Please check the `ReleaseNotes.txt` for details about new features and
-changes since Subsurface 4.9.4 (and earlier versions).
+changes since Subsurface 4.9.5 (and earlier versions).
Subsurface can be found at http://subsurface-divelog.org
@@ -39,10 +39,10 @@ development version) you can either get this via git or the release tar
ball. After cloning run the following command:
```
-git checkout v4.9.5 (or whatever the last release is)
+git checkout v4.9.6 (or whatever the last release is)
```
-or download a tarball from http://subsurface-divelog.org/downloads/Subsurface-4.9.5.tgz
+or download a tarball from http://subsurface-divelog.org/downloads/Subsurface-4.9.6.tgz
Detailed build instructions can be found in the INSTALL file.
diff --git a/ReleaseNotes/ReleaseNotes.txt b/ReleaseNotes/ReleaseNotes.txt
index 0b1fb92da..caa2ce551 100644
--- a/ReleaseNotes/ReleaseNotes.txt
+++ b/ReleaseNotes/ReleaseNotes.txt
@@ -2,6 +2,12 @@
= _Subsurface_ Release Notes
+New in _Subsurface_ 4.9.6
+~~~~~~~~~~~~~~~~~~~~~~~~~
+bugfixes:
+- fix crashes when using user space FTDI driver
+- re-enable user space FTDI in the Mac binaries
+
New in _Subsurface_ 4.9.5
~~~~~~~~~~~~~~~~~~~~~~~~~
new features: