]> git.tdb.fi Git - ext/subsurface.git/commitdiff
projects / ext / subsurface.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2101f37 84f570b)
Merge branches 'mingw-port-cleanup' and 'combobox-text-entry-fix' of git://github...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Oct 2011 14:23:41 +0000 (07:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Oct 2011 14:23:41 +0000 (07:23 -0700)
* 'mingw-port-cleanup' of git://github.com/dirkhh/subsurface:
  Use Registry on Windows to store preferences

* 'combobox-text-entry-fix' of git://github.com/dirkhh/subsurface:
  Update the known locations / buddies / divemasters as user enters them


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