diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-14 18:19:48 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-14 18:19:48 -0800 |
commit | b0759feef87fcf820682cb36d65f2252c2cc12ae (patch) | |
tree | 4767b4ac0f5222c1500cb1f0826b94e87fd4b6b0 /display-gtk.h | |
parent | df12fcf310d97ba7244755c687c6119da17928e2 (diff) | |
parent | 6245b700a4a98cc2dba8c5b8c3f4958491605755 (diff) | |
download | subsurface-b0759feef87fcf820682cb36d65f2252c2cc12ae.tar.gz |
Merge branch 'forlinus' of git://git.hohndel.org/subsurface
* 'forlinus' of git://git.hohndel.org/subsurface:
Improve Makefile for MacOS
Add reasonable default device names for divecomputer import
More intuitive label for "not saving" when exiting
Diffstat (limited to 'display-gtk.h')
-rw-r--r-- | display-gtk.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/display-gtk.h b/display-gtk.h index 8ca5a450e..b20495731 100644 --- a/display-gtk.h +++ b/display-gtk.h @@ -32,6 +32,8 @@ extern void subsurface_set_conf(char *name, pref_type_t type, const void *value) extern const void *subsurface_get_conf(char *name, pref_type_t type); extern void subsurface_close_conf(void); +extern const char *subsurface_USB_name(void); + extern visible_cols_t visible_cols; extern const char *divelist_font; |