diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-08-30 20:17:20 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-08-30 20:17:20 -0700 |
| commit | db17edda65d6e4040bd0e7f613f814d21eedeb86 (patch) | |
| tree | b9345051ae404fba82419e2858b1b210175b2731 /qt-ui/modeldelegates.cpp | |
| parent | 9bc7d8f514d40da94285be980e19d6f16f421067 (diff) | |
| parent | ab649e21ba07c9f572d61350b9217609f44f7f04 (diff) | |
| download | subsurface-db17edda65d6e4040bd0e7f613f814d21eedeb86.tar.gz | |
Merge branch 'bugfixes' of github.com:danilocesar/subsurface
Fixed one conflict in qt-ui/diveplanner.cpp - please check I got this
right.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/modeldelegates.cpp')
0 files changed, 0 insertions, 0 deletions