diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-20 00:53:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-20 00:53:40 +0100 |
| commit | 0da7c88a1afb221f97e2e96c159b1a984e4e2f71 (patch) | |
| tree | 558590d5ad0a2ced262c2142915b738d898ddbf0 /src/wx/config_dialog.cc | |
| parent | 4a677ee9e750efc330c29df69f19dae27f09aa4d (diff) | |
| parent | da38ed791a5a46a97b26947409cf837b7939fd54 (diff) | |
Merge master; fix destruction of Server; some test cleanups.
Diffstat (limited to 'src/wx/config_dialog.cc')
| -rw-r--r-- | src/wx/config_dialog.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 68fbc3f1b..b447e0eee 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -35,6 +35,7 @@ #include "lib/filter.h" #include "lib/dcp_content_type.h" #include "lib/colour_conversion.h" +#include "lib/log.h" #include "config_dialog.h" #include "wx_util.h" #include "editable_list.h" |