Marius Kintel bab951b344 Merge branch 'master' into unstable ... Conflicts: src/CGALEvaluator.cc src/MainWindow.h src/MainWindow.ui src/import.cc src/mainwin.cc src/winconsole.c tests/CMakeLists.txt		2014-02-23 15:49:26 -05:00
..
dxf	fixup issue 593	2014-01-25 18:43:33 +04:00
modulecache-tests	Added test for #181	2014-02-10 02:18:50 -05:00
scad	Merge branch 'master' into unstable	2014-02-23 15:49:26 -05:00
stl	fix issue #235	2014-02-17 14:19:12 -06:00