Merge branch 'quirks' of https://github.com/tcanabrava/subsurface

Browse Source

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	qt-ui/modeldelegates.cpp
	qt-ui/modeldelegates.h

...

This commit is contained in:

Dirk Hohndel 2013-09-16 20:55:44 -04:00

parent 396d73705e 430a77b8a7

commit 30dbfc1f57

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available