Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0

1 files changed, 9 insertions, 9 deletions

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 67e1a9951..300800697 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -17,24 +17,24 @@
 
 */
 
-#include <wx/treectrl.h>
-#include <wx/datectrl.h>
-#include <wx/timectrl.h>
-#include <wx/stdpaths.h>
-#include <wx/listctrl.h>
-#include <libcxml/cxml.h>
-#include "lib/cinema.h"
-#include "lib/config.h"
-#include "lib/film.h"
 #include "kdm_dialog.h"
 #include "cinema_dialog.h"
 #include "screen_dialog.h"
 #include "wx_util.h"
 #ifdef DCPOMATIC_USE_OWN_DIR_PICKER
 #include "dir_picker_ctrl.h"
+#include "lib/cinema.h"
+#include "lib/config.h"
+#include "lib/film.h"
+#include <libcxml/cxml.h>
 #else
 #include <wx/filepicker.h>
 #endif
+#include <wx/treectrl.h>
+#include <wx/datectrl.h>
+#include <wx/timectrl.h>
+#include <wx/stdpaths.h>
+#include <wx/listctrl.h>
 
 using std::string;
 using std::map;