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

Merge remote-tracking branch 'origin/master' into gridfix

master
Marius Kintel 2015-01-06 22:47:43 -05:00
parent 61cf460a4f 7b2d01ff51
commit b302cb172b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/FontListDialog.cc
View File

@ -136,11 +136,11 @@ void FontListDialog::update_font_list()
QString FontListDialog::quote(const QString& text) QString FontListDialog::quote(const QString& text)
{ {
QString result = text; QString result = text;
result.replace('\\', "\\\\") result.replace('\\', "\\\\\\\\")
.replace('-', "\\-") .replace('-', "\\\\-")
.replace(':', "\\:") .replace(':', "\\\\:")
.replace(',', "\\,") .replace(',', "\\\\,")
.replace('=', "\\=") .replace('=', "\\\\=")
.replace('_', "\\_"); .replace('_', "\\\\_");
return result; return result;
} }

4
src/cgalutils.cc
View File

@ -16,8 +16,8 @@
#include <CGAL/config.h> #include <CGAL/config.h>
#include <CGAL/version.h> #include <CGAL/version.h>
// Apply CGAL bugfix. Note: If using CGAL < 4.3, hull() might be buggy // Apply CGAL bugfix for CGAL-4.5.x
#if CGAL_VERSION_NR > CGAL_VERSION_NUMBER(4,5,1) || CGAL_VERSION_NR < CGAL_VERSION_NUMBER(4,3,0) #if CGAL_VERSION_NR > CGAL_VERSION_NUMBER(4,5,1) || CGAL_VERSION_NR < CGAL_VERSION_NUMBER(4,5,0)
#include <CGAL/convex_hull_3.h> #include <CGAL/convex_hull_3.h>
#else #else
#include "convex_hull_3_bugfix.h" #include "convex_hull_3_bugfix.h"