Merge branch 'master' of https://github.com/okamstudio/godot

scene/gui/rich_text_label.cpp

@@ -114,7 +114,7 @@ void RichTextLabel::_process_line(int &y, int p_width, int p_line, ProcessMode p
 		line++;\
 		if (line < l.offset_caches.size())\
 			line_ofs=l.offset_caches[line];\
-		wofs=margin;\		
+		wofs=margin;\
 		if (align!=ALIGN_FILL)\
 			wofs+=line_ofs;\
 	} else {\

tools/export/blender25/io_scene_dae/__init__.py

@@ -81,7 +81,7 @@ class ExportDAE(bpy.types.Operator, ExportHelper):
     use_mesh_modifiers = BoolProperty(
             name="Apply Modifiers",
             description="Apply modifiers to mesh objects (on a copy!).",
-            default=True,
+	    default=False,
             )
     use_tangent_arrays = BoolProperty(
 	    name="Tangent Arrays",