mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
19356 commits 100 branches 97 tags 206 MiB
Commit graph

351 commits

Author SHA1 Message Date
Jan Mulder
a95e658946 Mobile: factor out syncToCloud [3/3] 
After the previous commits, we now have a preference that nicely
preserves the state of the UI, and we have the well known git_local_only
global, that is used to denote whether we want to use to local repo
only, or we want to interact with the online cloud as well.

This commit gets rid of the now superfluous syncToCloud logic. Instead
we simply set the git_local_only directly.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2018-10-09 10:03:21 -07:00
Berthold Stoeger
a5ad550df5 CHANGELOG.md update 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
 2018-10-07 17:50:51 +03:00
Dirk Hohndel
d13f2ad8d5 Update README and ReleaseNotes for 4.8.3 / 2.1.4 
Slight updates / rephrasing of the CHANGELOG entries as they get moved
to ReleaseNotes.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-09-28 15:36:59 -07:00
Jan Mulder
56b24707a5 CHANGELOG: update for mobile 
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2018-09-28 11:09:17 -07:00
Berthold Stoeger
b19fe27e19 CHANGELOG.md update 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
 2018-09-25 14:59:14 -07:00
Dirk Hohndel
d90f958238 Add CHANGELOG 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-09-23 11:49:30 -07:00
Jocke
95e2c29827 Update Changelog 
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-09-19 14:41:43 -07:00
Dirk Hohndel
be2e3c90db Move CHANGELOG entries to ReleaseNotes 
Sort and edit them in the process.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-09-17 09:04:39 -07:00
Miika Turkia
4b42dcc6af Changlog update for DLF import 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2018-09-16 08:07:54 -07:00
Jan Mulder
d16bcd8978 Desktop: remove "edit dive" from log menu 
Nowadays, we edit dives just by starting to enter data for the dive.
There is no need to explicitly ask to start editing the dive, using the
now removed menu option. This was a left-over of a long past history.

This is fallout from PR #1673.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2018-09-14 13:18:42 -07:00
Jan Mulder
b79dd2c423 Update CHANGELOG 
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2018-09-14 10:00:54 +02:00
Robert C. Helling
afe363fa85 Optional anonymization upon export 
Add a checkbox that triggers replacement of all English characters by
x's in notes, buddy, dive guide and (while we are at it) suit.

This is ment for people sharing logs for debugging that are concious
about privacy issues. It leaves the lenth of strings in tact as well
as special charcters as those might be needed to track down a particular
parsing problem.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2018-09-13 08:16:54 -07:00
jan Iversen
adbb1488e8 update CHANGELOG.md 
Add line about show_developer being saved to disk in the mobile UI

Signed-off-by: Jan Iversen <jani@apache.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-09-12 20:19:35 -07:00
Jan Mulder
c75f53a7a8 CHANGELOG: not UI any more in mobile for GPS webservice 
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2018-09-10 07:50:50 -07:00
Jan Mulder
39b52d8abf CHANGELOG: remove GPS import from webservice 
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2018-09-09 18:28:08 -07:00
Miika Turkia
97f75472e8 Update changelog 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2018-09-09 12:26:45 -07:00
Dirk Hohndel
6d85e730b8 Update CHANGELOG 
A couple of updates that hadn't made it into the CHANGELOG.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-09-05 13:34:51 -07:00
Jan Mulder
af77293ce7 Update CHANGELOG for RFC 1587 
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2018-09-04 15:02:07 -07:00
Lubomir I. Ivanov
044069484d CHANGELOG.md: update with the latest Win32 log files change 
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 2018-09-03 13:29:03 -07:00
Lubomir I. Ivanov
0566f344a9 CHANGELOG.md: update with the latest divelist columns fix 
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 2018-08-26 23:08:24 -07:00
Lubomir I. Ivanov
5204af58da CHANGELOG.md: add note for the latest dive list row height change 
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 2018-08-26 23:06:00 -07:00
Jocke
84eb2e377e Update Changelog 
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
 2018-08-25 07:01:42 -07:00
Lubomir I. Ivanov
c354abfe7c CHANGELOG.md: add note about html-export bugfix 
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 2018-08-23 05:01:32 -07:00
Lubomir I. Ivanov
38f09cbd16 CHANGELOG.md: update with the latest map-widget fix 
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 2018-08-18 18:50:26 +02:00
Dirk Hohndel
47110d5052 Add Android changes to CHANGELOG 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-08-11 11:30:38 -07:00
Joakim Bygdell
9c65e35fa4 Update CHANGELOG.md 
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
 2018-08-11 11:19:07 -07:00
Dirk Hohndel
8df6789a9d build-system: update libzip to 1.5.1 
This also switches us to libzip's new official home on GitHub, and takes into
account that libzip no longer supports autotools and instead now is cmake
based.

Building against that, on my Mac build system, Subsurface once again correctly
opens DLD files downloaded from divelogs.de.

Fixes #1534

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-08-04 12:23:47 -07:00
Berthold Stoeger
ff2de9099f CHANGELOG.md update 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
 2018-07-28 15:31:25 -07:00
Berthold Stoeger
597aa75348 Update CHANGELOG.md 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
 2018-07-23 15:58:55 -07:00
Berthold Stoeger
4bb56db35e Update CHANGELOG.md 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
 2018-07-20 08:29:27 +02:00
Stefan Fuchs
397ff368d5 Update CHANGELOG.md 
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
 2018-07-15 09:38:12 -07:00
Dirk Hohndel
55336bd7ad Merge branch 'metadata' of https://github.com/bstoeger/subsurface 2018-07-14 08:20:47 -07:00
Dirk Hohndel
e834874a7a Merge branch 'qPrefDisplay' of https://github.com/janiversen/subsurface 2018-07-14 08:14:31 -07:00
Dirk Hohndel
cf329ca131 Merge branch 'qml_test' of https://github.com/janiversen/subsurface 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-07-14 08:12:27 -07:00
Berthold Stoeger
cf73afb452 Update CHANGELOG.md 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
 2018-07-14 08:34:10 +02:00
Berthold Stoeger
52cc51f906 Update CHANGELOG.md 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-07-13 17:07:52 -07:00
Dirk Hohndel
b2422f8856 Prepare README and ReleaseNotes for 4.8.1 
And clear out CHANGELOG.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-07-13 15:28:06 -07:00
Dirk Hohndel
ff1490184b Update CHANGELOG.md 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-07-13 11:30:31 -07:00
Stefan Fuchs
7b6f67881c Update CHANGELOG.md 
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
 2018-07-13 11:26:28 -07:00
jan Iversen
aa0a918082 core: qPrefDisplay update CHANGELOG.md 
added note about "show developer" menu being stored on disk

Signed-off-by: Jan Iversen <jani@apache.org>
 2018-07-12 19:01:31 +02:00
jan Iversen
b05e4c7b5f tests: make qml test harness 
build a qml test runner that includes ssrf interface

The qml test runner allows having qml test files.

Signed-off-by: Jan Iversen <jani@apache.org>
 2018-07-12 17:12:56 +02:00
Berthold Stoeger
6a4f1e0ed3 Update CHANGELOG.md 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
 2018-07-09 09:12:58 -07:00
Lubomir I. Ivanov
fe2f665ebe CHANGELOG.md: fix bad markdown formatting 
The # and <> characters introduced formatting issues,
for those who wanted to view our changelog in the Github
repository.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 2018-07-08 11:06:34 -07:00
Lubomir I. Ivanov
22ed70d6fb CHANGELOG.md: update with the recent save-git fix 
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 2018-07-07 17:42:10 -07:00
Dirk Hohndel
f46424d4bb Update CHANGELOG.md 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-07-03 16:31:33 -07:00
Robert C. Helling
e75992e55e CHANGELOG entry 
Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2018-07-03 14:47:15 -07:00
Berthold Stoeger
9421429cc6 Update CHANGELOG.md 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
 2018-07-04 02:27:36 +08:00
Dirk Hohndel
5375eee4e6 Add CHANGELOG.md entry 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-07-02 13:37:36 -07:00
Dirk Hohndel
d5bc885e8b ReleaseNotes: start preparing for 4.8 / 2.1 
Move changes from CHANGELOG to ReleaseNotes and add a few items that
were missing.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-06-25 20:28:20 +08:00
Dirk Hohndel
547dd51892 Update CHANGELOG.md 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-06-20 11:36:44 +09:00
Lubomir I. Ivanov
e0f7a2ca37 CHANGELOG.md: add note about fixing a MAX_TANK_INFO bug 
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 2018-06-20 09:30:58 +09:00
Berthold Stoeger
44a9b26889 Update to CHANGELOG.md 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-06-18 15:12:10 +09:00
Dirk Hohndel
22b695dd71 Add CHANGELOG entry 
And edited some older ones for consistency.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-06-18 06:34:05 +09:00
jan Iversen
33da1d59af CHANGELOG: update with end-user relevant PR`s 
Signed-off-by: Jan Iversen <jani@apache.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-06-17 17:17:24 +09:00
Miika Turkia
bef573ae3f changelog 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2018-05-27 23:18:01 +03:00
Robert C. Helling
f4d569d89d Mention bailout in Changelog 
Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2018-05-14 23:47:00 +03:00
Berthold Stoeger
d4a6822fab Update CHANGELOG.md 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
 2018-05-13 13:13:18 -07:00
Dirk Hohndel
818f02ec4a Desktop: fix time format in main tab 
Fixes #1234

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-05-04 05:59:17 +02:00
Dirk Hohndel
aba4b1d390 Update CHANGELOG 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-04-15 10:15:36 -07:00
Robert C. Helling
ece714556f Look for actual isobaric counter diffusion 
Identify segements that fullfill the folllowing criteria for
the leading compartment:

He is off-gasing while N2 is on-gasing
Overall there is on-gasing

Add a line to the info box for those segments

Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2018-04-11 21:15:38 +02:00
Miika Turkia
cfafbd1b37 changelog.md update 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2018-04-07 11:33:09 -07:00
Dirk Hohndel
07366daea5 Update README and ReleaseNotes for 4.7.8 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-04-05 08:24:35 -07:00
Jeremie Guichard
12dc1889c7 Add "Tags" column in Desktop app's dive list view 
Add DiveItem::displayTags helper method to return Tags as a QString
New Tags column is
 by default inserted before "Photos" column
 by default disabled

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
 2018-04-04 14:10:45 +03:00
Dirk Hohndel
78986589f0 Update CHANGELOG 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-04-03 11:55:48 -07:00
Dirk Hohndel
b4ddcbfb63 Add new dive computers to CHANGELOG 
I think some of those were already supported in 4.7.7.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-04-03 11:30:33 -07:00
Berthold Stoeger
b8f45d0ec9 Update CHANGELOG.md 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-03-19 13:15:00 -07:00
Stefan Fuchs
a2111a4198 CSV export: CHANGELOG entry 
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
 2018-03-19 11:59:58 -07:00
Lubomir I. Ivanov
8c0dfe4483 CHANGELOG.md: add latest map-widget changes 
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 2018-03-15 23:27:18 +02:00
Lubomir I. Ivanov
c52df79cf1 CHANGELOG.md: add note about the map widget changes 
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 2018-03-11 11:40:12 -07:00
Stefan Fuchs
584b7eb47e Release notes for numeric format, delete cylinders and change comment 
Add two release note items and change comment in CHANGELOG.md file.

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
 2018-03-07 13:48:23 +02:00
Oliver Schwaneberg
0ca52f868e Choose water presets from a qcombobox in planner, custom value possible 
Add a combo box for water types with defaults for fresh water, sea water
and the EN 13319. All values taken from units.h, where EN 13319 was added
beforehand.
Custom values can be entered through a spinbox.
Also changed "Salinity" in TapDiveInformation.ui to "Water type".

Translation required!

Signed-off-by: Oliver Schwaneberg <oliver.schwaneberg@gmail.com>
 2018-03-02 08:38:22 -08:00
Miika Turkia
d4eb2ba1a1 UDCF import comment to changelog 
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
 2018-02-15 17:54:05 +02:00
Dirk Hohndel
dfb43d3f51 Move entries from CHANGELOG to ReleaseNotes 
Small cleanups, some resorting, add some details about libdivecomputer.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-02-09 13:43:02 -08:00
Oliver Schwaneberg
218ea94831 Bugfix in plannermodel for very short dive durations 
When adding a dive manually, you might clear the "duration" field and fill
in your value by hand. Unfortunately, commit #1052 produced a bug that
practically limited the dive duration to 6 minutes once the field was cleared.

Signed-off-by: Oliver Schwaneberg <oliver.schwaneberg@gmail.com>
 2018-02-07 09:22:15 +01:00
Dirk Hohndel
c4fc202c45 Update CHANGELOG 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-02-04 13:42:13 -08:00
Lubomir I. Ivanov
a32f12592b CHANGELOG.md: add missing changes before the release 
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 2018-02-03 20:18:12 +02:00
Jan Mulder
d6c8edc2db Added relevant items to CHANGELOG 
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2018-02-02 11:20:54 -08:00
Robert C. Helling
c89cfcccbe Only give ICD warning if pN2 increases 
as otherwise there are warning on the descent.

The ICD line in the info box is generated for all
gas switches with decreasing He content.

Also change the presentation in the info box to align it
with the notes.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2018-01-21 15:24:46 +01:00
Robert C. Helling
0d103b456c CHANGELOG entry for ICD 
Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2018-01-21 15:24:46 +01:00
Berthold Stoeger
785dcda0d5 Update CHANGELOG.md concerning cloud online/offline changes 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
 2018-01-06 10:46:07 -08:00
Dirk Hohndel
7a48149868 Update CHANGELOG.md 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2018-01-02 09:15:30 -08:00
Robert C. Helling
2478158c0f Reenable pressure interpolation in context menu 
This fixes a bug reported by Willem that removing waypoints
using the right click context menu makes the cylinder
pressure lines partly disappear.

The reason was that clicking a dive handler disables the
pressure interpolation (and other things, controlled by
shouldCalculateMaxdepth). This is turned on again upon
the mouse release event. This event is not triggered when
selecting in item from the context menu (like remove
waypoint or gas selection) so we need to send it manually.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2017-12-30 11:36:47 +01:00
Dirk Hohndel
d0dcac2971 Getting ready for Subsurface 4.7.6 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-28 20:34:02 -08:00
Berthold Stoeger
65213f044e Update CHANGELOG.md to reflect new filter features 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
 2017-12-26 13:08:49 -08:00
Jan Mulder
8e9ba7bd7a CHANGELOG.md 
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2017-12-25 19:47:57 +01:00
Dirk Hohndel
6a39e3ff20 Update CHANGELOG 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-24 11:45:26 -08:00
Jan Mulder
b7dcbb58fa CHANGELOG.md 
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2017-12-19 05:13:23 -08:00
Robert C. Helling
8633577a45 Changelog 
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-18 15:35:27 -08:00
Berthold Stoeger
54feaa8fcb Update CHANGELOG.md 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
 2017-12-18 12:07:10 -08:00
Jan Mulder
5e116db1a1 CHANGELOG.md 
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2017-12-18 15:23:23 +01:00
Jan Mulder
c2e76aab4b CHANGELOG.md 
I think that every published issue that is fixed should be in
the changelog.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2017-12-14 08:53:06 -08:00
Jan Mulder
375490dfc9 CHANGELOG.md 
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2017-12-13 08:23:27 -08:00
Dirk Hohndel
88141fb70d Add CHANGELOG for the last merge 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-13 05:51:39 -08:00
Jan Mulder
3a64d8a481 CHANGELOG.md 
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
 2017-12-13 05:03:36 -08:00
Robert C. Helling
256ae870a6 Write profile images to correct directory in TeX export 
Before, we did not look at the path of the filename to export
to but we should write the images there and not in pwd.

Fixes #931

Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2017-12-11 20:26:22 +01:00
Lubomir I. Ivanov
43fc5b6f9e ReleaseNotes.txt: apply CHANGELOG.md 
- Minor formatting changes
- Added a couple of missing notes
- Make the ReleaseNotes.txt format to indicate the latest
version on top

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-07 15:15:37 -08:00
Dirk Hohndel
a689d4aa1f Mark changes for Subsurface-mobile as such 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
 2017-12-05 20:07:00 -08:00
Robert C. Helling
afd46a60f7 Add button to rescan BT devices 
Otherwise the divecomputer has to be in pairing mode
at app start time.

Unfortunately, this leaves less space for the progress message.
My time/qml knowledge does not suffice to move that to the next line
(when moving that out of the RowLayout it overlaps with
the buttons).

Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2017-12-05 20:05:16 -08:00
Robert C. Helling
d8350ef238 Document background computation of variations 
Update changelog, update user manual, clarify
meaning in dive notes.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
 2017-12-01 15:47:51 -08:00
Stefan Fuchs
c56c7bd2e6 Release notes update: Cylinder depth from planner, merging dive info 
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
 2017-11-29 15:18:41 +01:00
Lubomir I. Ivanov
6437a2e18e release-notes: use CHANGELOG.md 
Add a file CHANGELOG.md in the root Subsurface directory
and track this file with the `-text merge=union` attribute.

This prevents merge conflicts if release notes are added
on top of the file by different commits.

Also, make ReleaseNotes/ReleaseNotes.txt point to that file.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
 2017-11-28 19:05:04 -08:00