diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-05 09:50:11 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-05-05 09:50:11 -0700 |
| commit | 1238fde17c9ef65dad81ccbc1145c41192af8e06 (patch) | |
| tree | 96816e06c5075cbc3f7ef9417823873af96c8840 /qt-ui/mainwindow.ui | |
| parent | adcae4d913c9e151c17da6b0371b2117c7dabb93 (diff) | |
| parent | c72609046adcaff2ca5af475113e583cbb943a04 (diff) | |
| download | subsurface-1238fde17c9ef65dad81ccbc1145c41192af8e06.tar.gz | |
Merge branch 'PlotsV2' of https://github.com/tcanabrava/subsurface into Qt
Minor conflicts based on my cleanup of Tomaz' earlier commits.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/mainwindow.ui')
0 files changed, 0 insertions, 0 deletions