diff options
author | don bright <hugh.m.bright@gmail.com> | 2013-02-24 03:54:53 (GMT) |
---|---|---|
committer | don bright <hugh.m.bright@gmail.com> | 2013-02-24 03:54:53 (GMT) |
commit | ca41979ee514f642c506e4f4d81461f19b587bf2 (patch) | |
tree | f31feb004d0b724d5240c8a227c7f0c886939a1b /openscad.qrc | |
parent | eff16283358217b43b310269a72e0cb47357a8b3 (diff) | |
parent | abc9da96c89b337377ee62ac29ee54e4e7b0a514 (diff) |
Merge branch 'master' of github.com:openscad/openscad into issue11_2
Conflicts:
RELEASE_NOTES
openscad.pro
src/mainwin.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> |