svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs...
[blender.git] / source / blender / makesrna / rna_cleanup / rna_properties.txt
1 # See svn history for example formatting for this file, currently this isnt in use.