projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
server_finder.cc
diff --git
a/src/lib/server_finder.cc
b/src/lib/server_finder.cc
index ed6016c6723f51e1be2f028b67fc952fda482978..de8a3852c5cf45c0abd52faaf94b4f08ee24e94c 100644
(file)
--- a/
src/lib/server_finder.cc
+++ b/
src/lib/server_finder.cc
@@
-18,7
+18,7
@@
*/
#include <libcxml/cxml.h>
*/
#include <libcxml/cxml.h>
-#include <
lib
dcp/raw_convert.h>
+#include <dcp/raw_convert.h>
#include "server_finder.h"
#include "exceptions.h"
#include "util.h"
#include "server_finder.h"
#include "exceptions.h"
#include "util.h"
@@
-33,7
+33,7
@@
using std::vector;
using std::cout;
using boost::shared_ptr;
using boost::scoped_array;
using std::cout;
using boost::shared_ptr;
using boost::scoped_array;
-using
lib
dcp::raw_convert;
+using dcp::raw_convert;
ServerFinder* ServerFinder::_instance = 0;
ServerFinder* ServerFinder::_instance = 0;