diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-03 12:13:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-03 12:13:54 -0700 |
| commit | 1531a37dd0b74fcb06ca06fd2f225d4a2d228a87 (patch) | |
| tree | 87edc576053e177afb4a3bcddee4876cea0ece47 /libdivecomputer.c | |
| parent | a32d28d5e388ab3e31eadcd329814488fa5e8b1b (diff) | |
| parent | c15f798a85db53dae404a9113266a4d2bc72fbc6 (diff) | |
| download | subsurface-1531a37dd0b74fcb06ca06fd2f225d4a2d228a87.tar.gz | |
Merge branch 'uemis-integration' of git://github.com/dirkhh/subsurface
* 'uemis-integration' of git://github.com/dirkhh/subsurface:
Remove the ability to 'Import' .SDA files
Integrate loading of uemis SDA files into the regular xml parsing
First steps towards integrating SDA files into the default XML loading
Diffstat (limited to 'libdivecomputer.c')
| -rw-r--r-- | libdivecomputer.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libdivecomputer.c b/libdivecomputer.c index 5fea5c28c..78be2019a 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -497,9 +497,6 @@ void do_import(device_data_t *data) pthread_t pthread; void *retval; - if (data->type == DEVICE_TYPE_UEMIS) - return uemis_import(); - /* I'm sure there is some better interface for waiting on a thread in a UI main loop */ import_thread_done = 0; pthread_create(&pthread, NULL, pthread_wrapper, data); @@ -542,6 +539,5 @@ struct device_list device_list[] = { { "Cressi Edy", DEVICE_TYPE_CRESSI_EDY }, { "Zeagle N2iTiON 3", DEVICE_TYPE_ZEAGLE_N2ITION3 }, { "Atomics Cobalt", DEVICE_TYPE_ATOMICS_COBALT }, - { "Uemis Zurich SDA", DEVICE_TYPE_UEMIS }, { NULL } }; |