Merged changes in the trunk up to revision 36757.

diff --cc source/blender/CMakeLists.txt
Simple merge

diff --cc source/blender/SConscript
Simple merge

diff --cc source/blender/blenkernel/CMakeLists.txt
Simple merge

diff --cc source/blender/blenkernel/SConscript
Simple merge

diff --cc source/blender/blenkernel/intern/object.c
Simple merge

diff --cc source/blender/blenlib/intern/bpath.c
Simple merge

diff --cc source/blender/blenloader/intern/readfile.c
Simple merge

diff --cc source/blender/blenloader/intern/writefile.c
Simple merge

diff --cc source/blender/editors/interface/interface_templates.c
Simple merge

diff --cc source/blender/editors/render/CMakeLists.txt
index cb67026ffbd9fa95359b63ac6fb538c1f2371ebb,b8102ba37a1edf38b38f339150def46696d0d5cd..032737c400e0df3db76020d903173951bf463798
--- 1/source/blender/editors/render/CMakeLists.txt
--- 2/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@@ -32,8 -32,7 +32,8 @@@ set(IN
        ../../render/extern/include
        ../../windowmanager
        ../../../../intern/guardedalloc
-     ${GLEW_INCLUDE_PATH}
+       ${GLEW_INCLUDE_PATH}
 +      ../../freestyle
  )
  
  set(SRC

diff --cc source/blender/editors/transform/transform.c
Simple merge

diff --cc source/blender/makesdna/DNA_ID.h
Simple merge

diff --cc source/blender/makesrna/RNA_access.h
Simple merge

diff --cc source/blender/makesrna/SConscript
Simple merge

diff --cc source/blender/makesrna/intern/CMakeLists.txt
Simple merge

diff --cc source/blender/makesrna/intern/makesrna.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_ID.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_color.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_internal.h
Simple merge

diff --cc source/blender/makesrna/intern/rna_scene.c
index b8ce006461d25bd436ad1d4c3f369764ce8e1e43,44dcabe40f956eac3f7ffe3dbf9ac7cc049b1650..6450e2259fbf281472bb89024755b9a3d16f3d0d
--- 1/source/blender/makesrna/intern/rna_scene.c
--- 2/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -2947,14 -2609,9 +2954,14 @@@ static void rna_def_scene_render_data(B
        prop= RNA_def_property(srna, "edge_color", PROP_FLOAT, PROP_COLOR);
        RNA_def_property_float_sdna(prop, NULL, "edgeR");
        RNA_def_property_array(prop, 3);
-       RNA_def_property_ui_text(prop, "Edge Color", "");
+       RNA_def_property_ui_text(prop, "Edge Color", "Edge color");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
        
 +      prop= RNA_def_property(srna, "use_freestyle", PROP_BOOLEAN, PROP_NONE);
 +      RNA_def_property_boolean_sdna(prop, NULL, "mode", R_EDGE_FRS);
 +      RNA_def_property_ui_text(prop, "Edge", "Draw stylized strokes using Freestyle.");
 +      RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 +
        /* threads */
        prop= RNA_def_property(srna, "threads", PROP_INT, PROP_NONE);
        RNA_def_property_int_sdna(prop, NULL, "threads");

diff --cc source/blender/render/extern/include/RE_pipeline.h
Simple merge

diff --cc source/creator/CMakeLists.txt
Simple merge

diff --cc source/creator/creator.c
Simple merge