svn merge ^/trunk/blender -r50173:50179
[blender.git] / release / freedesktop /
drwxr-xr-x   ..
-rw-r--r-- 514 blender.desktop
drwxr-xr-x - icons