diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2012-12-11 13:09:48 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2012-12-11 13:09:48 -0800 |
| commit | 91577f11b5373557dca50627b8e3348b6dee2514 (patch) | |
| tree | 8f9179a9b1f42375f4a34743efc111594bb1a7c4 /file.h | |
| parent | c6ca263fb024bf06f76a5a89fbcd982f3f658d39 (diff) | |
| parent | 563af1daa781a53fad308870320f99a1903d5058 (diff) | |
| download | subsurface-91577f11b5373557dca50627b8e3348b6dee2514.tar.gz | |
Merge branch 'cns' into cns-merge
I foolishly changed visible_columns in both the (ill-named) cns branch and
master...
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Conflicts:
divelist.c
gtk-gui.c
profile.c
Diffstat (limited to 'file.h')
0 files changed, 0 insertions, 0 deletions