diff options
| author |  Salvador Cuñat <salvador.cunat@gmail.com> | 2015-02-20 19:53:45 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-02-22 07:46:28 -0800 |
| commit | 3610c7b3b7f983ea1156860241837bde8e1dd784 (patch) | |
| tree | 4f8f0f77be59404dee1bf971ceb330f357218e71 /configuredivecomputer.h | |
| parent | a76d5fb9662e1723bad712349bb715c392459f34 (diff) | |
| download | subsurface-3610c7b3b7f983ea1156860241837bde8e1dd784.tar.gz | |
merge conflicts
Backport to 4.4.1 because of unresolved merge conflicts from f1f0294
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'configuredivecomputer.h')
0 files changed, 0 insertions, 0 deletions