svn merge ^/trunk/blender -r42516:42521
[blender-staging.git] / release / freedesktop /
drwxr-xr-x   ..
-rw-r--r-- 444 blender.desktop
drwxr-xr-x - icons