soc-2008-mxcurioni: merge-repair with trunk rev 15456
authorMaxime Curioni <maxime.curioni@gmail.com>
Sun, 6 Jul 2008 19:53:32 +0000 (19:53 +0000)
committerMaxime Curioni <maxime.curioni@gmail.com>
Sun, 6 Jul 2008 19:53:32 +0000 (19:53 +0000)
commit270184e1b2e98a00d9e7f5598084fe65943bf925
tree1dafc3678a12ee187e4ab0a5e94efc7690213e0b
parenteda7cdc81dde901f0fbfee6e9c0b04031b212e69
parenta06a4663c4df9094acf5ab01e7407f379b137b51
soc-2008-mxcurioni: merge-repair with trunk rev 15456
source/blender/freestyle/intern/app_blender/api.cpp
source/blender/yafray/SConscript