svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs...
[blender.git] / release /
drwxr-xr-x   ..
drwxr-xr-x - bin
drwxr-xr-x - datafiles
-rw-r--r-- 1146 environment-macosx
-rw-r--r-- 1123 environment-mswindows
-rw-r--r-- 1027 environment-unix
drwxr-xr-x - freedesktop
drwxr-xr-x - plugins
drwxr-xr-x - scripts
drwxr-xr-x - text
drwxr-xr-x - windows