]> git.tdb.fi Git - ext/subsurface.git/commitdiff
projects / ext / subsurface.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd89b47 d37d721)
Merge branch 'ui' of git://github.com/dirkhh/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Sep 2011 03:27:28 +0000 (20:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 Sep 2011 03:27:28 +0000 (20:27 -0700)
* 'ui' of git://github.com/dirkhh/subsurface:
  The notebook pages can only be dropped back into the main notebook
  Linus would like to be less on the bleeding edge of Gtk+
  Use the correct signal to avoid Gtk-CRITICAL error message
  Clean up the drag and drop code and allow ripping off the Dive Profile


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