diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-09-16 20:55:44 -0400 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-09-16 20:57:51 -0400 |
| commit | 30dbfc1f570ac95baade002c525c5d1351f58ae3 (patch) | |
| tree | 703d54ed6243e8ece807560da735c38f4ea2ad85 | |
| parent | 396d73705e268619c07178171e3b99f095485ebd (diff) | |
| parent | 430a77b8a75668f2fac21cdced3fac2d05073089 (diff) | |
| download | subsurface-30dbfc1f570ac95baade002c525c5d1351f58ae3.tar.gz | |
Merge branch 'quirks' of https://github.com/tcanabrava/subsurface
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Conflicts:
qt-ui/modeldelegates.cpp
qt-ui/modeldelegates.h
0 files changed, 0 insertions, 0 deletions