diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-09-19 02:25:49 +0400 |
commit | be50ce61be7fdc96943dbdac79aabd88ba29996f (patch) | |
tree | 4dfde72478458923a3b2ce8d22e1658d4508024c /source/darwin/blender.app/Contents | |
parent | 0a4d70f4d0ddc5bc709b162d84ec334e66ed848d (diff) |
Merged
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).
After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.
Diffstat (limited to 'source/darwin/blender.app/Contents')
-rw-r--r-- | source/darwin/blender.app/Contents/Resources/blender file icon.icns | bin | 48363 -> 145836 bytes |
-rw-r--r-- | source/darwin/blender.app/Contents/Resources/blender icon.icns | bin | 43688 -> 189097 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/source/darwin/blender.app/Contents/Resources/blender file icon.icns b/source/darwin/blender.app/Contents/Resources/blender file icon.icns Binary files differindex 78d84cf70c3..9065f1b359c 100644 --- a/source/darwin/blender.app/Contents/Resources/blender file icon.icns +++ b/source/darwin/blender.app/Contents/Resources/blender file icon.icns diff --git a/source/darwin/blender.app/Contents/Resources/blender icon.icns b/source/darwin/blender.app/Contents/Resources/blender icon.icns Binary files differindex a9b352f9a1c..5eef94afde9 100644 --- a/source/darwin/blender.app/Contents/Resources/blender icon.icns +++ b/source/darwin/blender.app/Contents/Resources/blender icon.icns |