pot/merge.

[dcpomatic.git] / src / wx / time_picker.cc

diff --git a/src/wx/time_picker.cc b/src/wx/time_picker.cc
index bddf615d0c68ce1ed276787c115a3206aede1dea..309e5c713b564cea157d8f772270786284e5b292 100644 (file)
--- a/src/wx/time_picker.cc
+++ b/src/wx/time_picker.cc
@@ -20,7 +20,7 @@
 
 #include "time_picker.h"
 #include "wx_util.h"
-#include "lib/locale_convert.h"
+#include <dcp/locale_convert.h>
 #include <wx/spinctrl.h>
 #include <boost/bind.hpp>
 #include <iomanip>
@@ -32,6 +32,7 @@ using std::max;
 using std::string;
 using std::cout;
 using boost::bind;
+using dcp::locale_convert;
 
 TimePicker::TimePicker (wxWindow* parent, wxDateTime time)
        : wxPanel (parent)