diff options
| author | Marius Kintel <marius@kintel.net> | 2011-07-30 23:58:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-07-30 23:58:51 (GMT) |
| commit | 6882228058d313bb7b98fddd90239bdb1a3e25ef (patch) | |
| tree | 9e3f0077a319939df7496fc6b18350c44cc4b0ec /doc | |
| parent | dd9dfcb4ece4dcd1ae7f3374ef03a4babdb91dd8 (diff) | |
| parent | c79ad5010e4ae8a612de5423cd52a518ed6b4d65 (diff) | |
Merge branch 'master' into visitor
Conflicts:
src/GLView.h
src/glview.cc
src/mainwin.cc
src/render-opencsg.cc
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/OpenSCAD-compile.graffle | bin | 4873 -> 4890 bytes | |||
| -rw-r--r-- | doc/OpenSCAD-csg.graffle | bin | 2692 -> 2680 bytes | |||
| -rw-r--r-- | doc/OpenSCAD-polygons.graffle | bin | 5035 -> 5047 bytes | |||
| -rw-r--r-- | doc/TODO.txt | 2 |
4 files changed, 0 insertions, 2 deletions
diff --git a/doc/OpenSCAD-compile.graffle b/doc/OpenSCAD-compile.graffle Binary files differindex 02e8bc8..bb505c3 100644 --- a/doc/OpenSCAD-compile.graffle +++ b/doc/OpenSCAD-compile.graffle diff --git a/doc/OpenSCAD-csg.graffle b/doc/OpenSCAD-csg.graffle Binary files differindex 7ad552c..ca0a0ff 100644 --- a/doc/OpenSCAD-csg.graffle +++ b/doc/OpenSCAD-csg.graffle diff --git a/doc/OpenSCAD-polygons.graffle b/doc/OpenSCAD-polygons.graffle Binary files differindex 3e8b5bd..40df7ab 100644 --- a/doc/OpenSCAD-polygons.graffle +++ b/doc/OpenSCAD-polygons.graffle diff --git a/doc/TODO.txt b/doc/TODO.txt index c0772f6..74e1f3f 100644 --- a/doc/TODO.txt +++ b/doc/TODO.txt @@ -49,7 +49,6 @@ o non-convex minkowski example from chrysn fails with an exception USER INTERFACE -------------- o Preferences - - Remember settings done in menus between sessions (automatic reload, perspective, show*, hide*) - Beautify color schemes - Color schemes read from file - Color scheme editor @@ -57,7 +56,6 @@ o Preferences - pointsize - OpenGL params - Default language feature settings - - Auto-view CSG/thrown together on load - Make the library search path configurable? o MDI - Think about how to do MDI the right way |