merge

Merge remote branch 'upstream/visitor' into visitortests

Conflicts:
	src/export.cc
	src/openscad.cc
	src/polyset.cc
	src/transform.cc
	tests/CMakeLists.txt
	tests/FindGLEW.cmake
	tests/csgtermtest.cc

1 files changed, 18 insertions, 18 deletions

diff --git a/boost.pri b/boost.pri
index b9f47d0..34a9dd2 100644
--- a/boost.pri
+++ b/boost.pri
@@ -1,18 +1,18 @@
-boost {

-  isEmpty(DEPLOYDIR) {

-    # Optionally specify location of boost using the

-    # BOOSTDIR env. variable

-    BOOST_DIR = $$(BOOSTDIR)

-    !isEmpty(BOOST_DIR) {

-      INCLUDEPATH += $$BOOST_DIR

-      message("boost location: $$BOOST_DIR")

-      win32:LIBS += -L$$BOOST_DIR/lib

-    }

-  }

-

-  win32 {

-     LIBS += -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1

-  } else {

-     LIBS += -lboost_thread -lboost_program_options

-  }

-}

+boost {
+  isEmpty(DEPLOYDIR) {
+    # Optionally specify location of boost using the
+    # BOOSTDIR env. variable
+    BOOST_DIR = $$(BOOSTDIR)
+    !isEmpty(BOOST_DIR) {
+      INCLUDEPATH += $$BOOST_DIR
+      message("boost location: $$BOOST_DIR")
+      win32:LIBS += -L$$BOOST_DIR/lib
+    }
+  }
+
+  win32 {
+     LIBS += -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1
+  } else {
+     LIBS += -lboost_thread -lboost_program_options
+  }
+}