From: Linus Torvalds Date: Sat, 29 Oct 2011 14:23:41 +0000 (-0700) Subject: Merge branches 'mingw-port-cleanup' and 'combobox-text-entry-fix' of git://github... X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=commitdiff_plain;h=28247d3baa9967fa39772c41077e714c4c533c82 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 --- 28247d3baa9967fa39772c41077e714c4c533c82