]> git.tdb.fi Git - ext/subsurface.git/commitdiff
projects / ext / subsurface.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 797343b 14547d8)
Merge branch 'fix-entries' of https://github.com/nathansamson/diveclog
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Sep 2011 16:58:34 +0000 (09:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Sep 2011 16:58:34 +0000 (09:58 -0700)
* 'fix-entries' of https://github.com/nathansamson/diveclog:
  Word wrap the info textview. Also do not show the scrollbars if not necessary.
  Change location to a text entry instead of text view.


Trivial merge
Rough divelog in C and Gtk (from https://github.com/torvalds/subsurface)