Blender Git Loki

Try to fix EOLs and props so the branch follows trunk style.
Other parts outside source/blender/freestyle/ seem to have been overriden in
the merge r23341 (by just using trunk version?), so it probably does not build
or builds without Freestyle. source/blender/CMakeLists.txt does not make any
reference to freestyle/, for example.