diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-29 07:23:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-29 07:23:41 -0700 |
| commit | 28247d3baa9967fa39772c41077e714c4c533c82 (patch) | |
| tree | 7b13f2de12b7bfda58120dafd6dff1ad91750e45 /equipment.c | |
| parent | 2101f37c1b81840beda99a7b4e87e938f9e52a7a (diff) | |
| parent | 84f570beef789695f080f9109febcff384d98c50 (diff) | |
| download | subsurface-28247d3baa9967fa39772c41077e714c4c533c82.tar.gz | |
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
Diffstat (limited to 'equipment.c')
0 files changed, 0 insertions, 0 deletions