Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions

This commit is contained in:
Jaime van Kessel 2016-06-17 14:59:16 +02:00
commit 78a0c623ef
216 changed files with 36097 additions and 5807 deletions

View file

@ -13,6 +13,7 @@ add_custom_command(TARGET tests POST_BUILD COMMAND "PYTHONPATH=${CMAKE_SOURCE_DI
set(CURA_VERSION "master" CACHE STRING "Version name of Cura")
set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'")
configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY)
# Macro needed to list all sub-directory of a directory.