diff options
| author | Marius Kintel <marius@kintel.net> | 2014-01-03 18:17:58 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2014-01-03 18:17:58 (GMT) |
| commit | bee5233a916055d41bb4ee425f5df25b80f50f16 (patch) | |
| tree | 7bfac9716f778ed685e62e2d0830d1905bc08fd2 /openscad.qrc | |
| parent | f093b53c3edb08ee0d64c5d6c2a1df723acfca2d (diff) | |
| parent | c5223417e3ffe965d09d971865797206080eb0ae (diff) | |
Merge branch 'vector-concat' of git://github.com/t-paul/openscad into t-paul-vector-concat
Conflicts:
src/Preferences.ui
Diffstat (limited to 'openscad.qrc')
| -rw-r--r-- | openscad.qrc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/openscad.qrc b/openscad.qrc index 28b6a72..6fd7e47 100644 --- a/openscad.qrc +++ b/openscad.qrc @@ -1,5 +1,6 @@ <RCC> <qresource prefix="/"> + <file>icons/prefsFeatures.png</file> <file>icons/stopbutton.png</file> <file>icons/prefsAdvanced.png</file> <file>icons/prefs3DView.png</file> |