diff options
author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-05-01 20:59:27 +0400 |
---|---|---|
committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2009-05-01 20:59:27 +0400 |
commit | 71c19dadbed638f3a0802e66f69093cf9b1c6303 (patch) | |
tree | 9e44f73c7700ab1a7d61feb6a68fb6dbc2be6407 /source/blender/render/intern/include/render_types.h | |
parent | 07288789014de44a93392d441198b8d6d029e59a (diff) | |
parent | 792449f8f0c3fac5ac4cb29db4abaa9c4cf89cd5 (diff) |
Merge from trunk
svn merge -r 19848:20018 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
Diffstat (limited to 'source/blender/render/intern/include/render_types.h')
0 files changed, 0 insertions, 0 deletions