Merge branch 'xs-model'

Conflicts:
	lib/Slic3r/Model.pm
This commit is contained in:
Alessandro Ranellucci 2013-12-13 12:22:17 +01:00
commit 21ca1901c1
24 changed files with 690 additions and 693 deletions

View file

@ -159,4 +159,8 @@ sub open {
return CORE::open $$fh, $mode, encode_path($filename);
}
# this package declaration prevents an ugly fatal warning to be emitted when
# spawning a new thread
package GLUquadricObjPtr;
1;