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 /icons | |
| parent | f70578f362c8c2c78036c9de846c20802ac7aa81 (diff) | |
| parent | beff2b1f4811b7f9d2b58bfc6a469a363bc9bfd0 (diff) | |
Merge branch 'master' into epec-kernel
Conflicts:
src/PolySetCGALEvaluator.cc
Diffstat (limited to 'icons')
| -rw-r--r-- | icons/SCAD.icns | bin | 0 -> 161935 bytes |
| -rw-r--r-- | icons/prefsUpdate.png | bin | 0 -> 10909 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/icons/SCAD.icns b/icons/SCAD.icns Binary files differnew file mode 100644 index 0000000..12abb48 --- /dev/null +++ b/icons/SCAD.icns diff --git a/icons/prefsUpdate.png b/icons/prefsUpdate.png Binary files differnew file mode 100644 index 0000000..a7dc02e --- /dev/null +++ b/icons/prefsUpdate.png |
