vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of git://github.com/brodykenrick/openscad into brodykenrick-master 

Conflicts:
	scripts/macosx-build-dependencies.sh
	tests/CMakeLists.txt
brodykenrick-master
Marius Kintel 2013-12-10 23:09:28 -05:00
parent 7cb3ea77ff d7d5bea736
commit 50fb5bb135
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/macosx-build-dependencies.sh
View File

@ -486,8 +486,12 @@ build_boost 1.54.0
# NB! For CGAL, also update the actual download URL in the function
build_cgal 4.3
build_glew 1.10.0
<<<<<<< HEAD
build_gettext 0.18.3.1
build_glib2 2.38.2
=======
build_glib2 2.38.1
>>>>>>> d7d5bea7363703c76b9787598304bfc838e893ee
build_opencsg 1.3.2
if $OPTION_DEPLOY; then
# build_sparkle andymatuschak 0ed83cf9f2eeb425d4fdd141c01a29d843970c20