]> git.tdb.fi Git - ext/subsurface.git/commit
projects / ext / subsurface.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit28247d3baa9967fa39772c41077e714c4c533c82
tree7b13f2de12b7bfda58120dafd6dff1ad91750e45tree | snapshot
parent2101f37c1b81840beda99a7b4e87e938f9e52a7acommit | diff
parent84f570beef789695f080f9109febcff384d98c50commit | diff
Merge branches 'mingw-port-cleanup' and 'combobox-text-entry-fix' of git://github.com/dirkhh/subsurface

* '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
Rough divelog in C and Gtk (from https://github.com/torvalds/subsurface)