| Age | Commit message (Collapse) | Author | 
 | 
 | 
 | 
- Removing user-dependency in dep-build path.
- QT Creator complains about entries in Preferences.ui
- File opescad.pro.user by QT Creator on Mac OS X 10.7.
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
built from in the about box. Pass -c to release_common.sh to turn this on. Please use this for development builds, see publish-macosx.sh for how development vs. release is handled
 | 
 | 
 | 
 | 
 | 
 | 
Conflicts:
	boost.pri
	src/lexer.l
	tests/CMakeLists.txt
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
Conflicts:
	boost.pri
	tests/CMakeLists.txt
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
*_polygon-holes-touch *_polygon-mesh
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
Conflicts:
	src/GLView.h
	src/glview.cc
	src/mainwin.cc
	src/render-opencsg.cc
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 | 
 |