diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-08-18 20:25:06 -0500 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-08-18 20:25:06 -0500 |
| commit | 150676ce3df0f60bd99204886c3a4e458253c093 (patch) | |
| tree | d722dafb6487d2dc56e78f8e39965fb1b7bed362 /qt-ui/profile/diveeventitem.h | |
| parent | 48fe5254dc9540f6b9fc13ab17029e6c7b8de975 (diff) | |
| parent | 7264ec2fa877eeffa99745ac4d7af91b93217aa5 (diff) | |
| download | subsurface-150676ce3df0f60bd99204886c3a4e458253c093.tar.gz | |
Merge branch 'joshua-gsoc' of git://github.com/thiagomacieira/subsurface into josh
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Conflicts:
subsurface.pro
Diffstat (limited to 'qt-ui/profile/diveeventitem.h')
0 files changed, 0 insertions, 0 deletions