diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-09 02:29:24 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-09 02:29:24 (GMT) |
| commit | 23f6b0623c86eba96dfb1296b862522cf02b0734 (patch) | |
| tree | 998500ef16763f6f08f9f7cb8917c98b1643af68 /icons | |
| parent | 52dfffd97ba49b603b4814d843cd9be08d040364 (diff) | |
| parent | 5044ea928d72da800d11b2b80f6148265c13d10f (diff) | |
Merge branch 'master' into threading
Conflicts:
RELEASE_NOTES
Diffstat (limited to 'icons')
| -rw-r--r-- | icons/icon-alpha.png | bin | 96607 -> 82391 bytes | |||
| -rw-r--r-- | icons/icon.png | bin | 121168 -> 84812 bytes | |||
| -rw-r--r-- | icons/mask.png | bin | 4470 -> 2359 bytes | |||
| -rw-r--r-- | icons/openscad.desktop | 7 | ||||
| -rw-r--r-- | icons/openscad.png | bin | 0 -> 82391 bytes |
5 files changed, 7 insertions, 0 deletions
diff --git a/icons/icon-alpha.png b/icons/icon-alpha.png Binary files differindex 67b6e63..192e5f1 100644 --- a/icons/icon-alpha.png +++ b/icons/icon-alpha.png diff --git a/icons/icon.png b/icons/icon.png Binary files differindex 7912038..837ead9 100644 --- a/icons/icon.png +++ b/icons/icon.png diff --git a/icons/mask.png b/icons/mask.png Binary files differindex eea1027..15ce869 100644 --- a/icons/mask.png +++ b/icons/mask.png diff --git a/icons/openscad.desktop b/icons/openscad.desktop new file mode 100644 index 0000000..07df5aa --- /dev/null +++ b/icons/openscad.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=OpenSCAD +Icon=openscad +Exec=openscad %f +Categories=Graphics;3DGraphics;Engineering; diff --git a/icons/openscad.png b/icons/openscad.png Binary files differnew file mode 100644 index 0000000..192e5f1 --- /dev/null +++ b/icons/openscad.png |
