mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'glib-removal-hack'

Browse source 
Fix obvious merge issue in Rules.mk

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-10-06 10:57:16 -07:00
commit b3490213f4
43 changed files with 629 additions and 795 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libdivecomputer.h
View file

@ -24,11 +24,11 @@ typedef struct device_data_t {
dc_device_t *device;
dc_context_t *context;
int preexisting;
gboolean force_download;
bool force_download;
} device_data_t;
const char *do_libdivecomputer_import(device_data_t *data);
char *do_uemis_import(const char *mountpath, short force_download);
const char *do_uemis_import(const char *mountpath, short force_download);
extern int import_thread_cancelled;
extern const char *progress_bar_text;