Commit Graph

5 Commits (6cecbc2a525483fff95aedd5188b361e7ed34ea3)

Author SHA1 Message Date
Marius Kintel 2cba2a1b55 Merge branch 'master' into text-module
Conflicts:
	scripts/macosx-build-homebrew.sh
	scripts/mingw-x-build-dependencies.sh
	scripts/uni-build-dependencies.sh
	scripts/uni-get-dependencies.sh
	src/GeometryEvaluator.h
	src/MainWindow.ui
	src/clipper-utils.h
	src/mainwin.cc
	tests/CMakeLists.txt
2014-04-26 22:08:31 -04:00
Marius Kintel c7530012be Build qt5 2014-02-04 01:21:13 -05:00
Marius Kintel 256a52d9c6 Added libs needed for text() module. Added support for MACOSX_DEPLOYMENT_TARGET 2014-02-03 20:18:50 -05:00
Marius Kintel 4da5657705 Made executable 2014-01-29 18:56:06 -05:00
Marius Kintel 5affb45eb3 Experimental homebrew dependency build 2014-01-04 18:14:14 -05:00