diff options
| author | Marius Kintel <marius@kintel.net> | 2013-12-11 04:09:28 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-12-11 04:09:28 (GMT) |
| commit | 50fb5bb135f62ed56230d8b8afd691284616b4f6 (patch) | |
| tree | 1d51892f9cf9b61fdf01eac2f8e95a6e32c54a1d | |
| parent | 7cb3ea77ff090e136eb4a9536a394b3766908d17 (diff) | |
| parent | d7d5bea7363703c76b9787598304bfc838e893ee (diff) | |
Merge branch 'master' of git://github.com/brodykenrick/openscad into brodykenrick-master
Conflicts:
scripts/macosx-build-dependencies.sh
tests/CMakeLists.txt
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index b61c656..72403f2 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -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 |