diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-04 12:33:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-04 12:33:41 +0100 |
| commit | 8102046b2f29e0c7b234c29bf204b056cb30e64f (patch) | |
| tree | 84933e8db7822e863ae9ab4e6524ab3176606b11 /src/lib/util.h | |
| parent | 3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0 (diff) | |
| parent | 82926443230084739cb673a83b2ab1f9d733a07b (diff) | |
Merge master.
Diffstat (limited to 'src/lib/util.h')
| -rw-r--r-- | src/lib/util.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/util.h b/src/lib/util.h index 28af8ef2f..7d3afb022 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -64,7 +64,6 @@ extern void dcpomatic_setup (); extern void dcpomatic_setup_gettext_i18n (std::string); extern std::vector<std::string> split_at_spaces_considering_quotes (std::string); extern std::string md5_digest (std::vector<boost::filesystem::path>, boost::shared_ptr<Job>); -extern std::string md5_digest (void const *, int); extern void ensure_ui_thread (); extern std::string audio_channel_name (int); extern bool valid_image_file (boost::filesystem::path); |