resolved conflict state with HEAD r14096
[blender.git] / intern / CMakeLists.txt
2007-11-06 Martin PoirierFilling in branch from trunk
2006-11-17 Jacques BeuarainCMake lists initial submission. Documentationand furthe...