mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 19:41:30 +00:00
Code Issues Projects Releases Packages Wiki Activity
13097 commits 102 branches 97 tags 206 MiB
Commit graph

2 commits

Author SHA1 Message Date
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