diff options
| author | Marius Kintel <marius@kintel.net> | 2013-03-28 03:55:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-03-28 03:55:51 (GMT) |
| commit | eefcd6d0b271642d470cd55bc47d1579d943938e (patch) | |
| tree | 48f9e4db455879025adb9317b740bfa4b72c2d66 /openscad.qrc | |
| parent | f70578f362c8c2c78036c9de846c20802ac7aa81 (diff) | |
| parent | beff2b1f4811b7f9d2b58bfc6a469a363bc9bfd0 (diff) | |
Merge branch 'master' into epec-kernel
Conflicts:
src/PolySetCGALEvaluator.cc
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 84745e9..28b6a72 100644 --- a/openscad.qrc +++ b/openscad.qrc @@ -4,6 +4,7 @@ <file>icons/prefsAdvanced.png</file> <file>icons/prefs3DView.png</file> <file>icons/prefsEditor.png</file> + <file>icons/prefsUpdate.png</file> <file>icons/flattr.png</file> <file>src/AboutDialog.html</file> </qresource> |