Tamito Kajiyama 3b711a6ed0 Merged changes in the trunk up to revision 45133. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c

2012-03-25 08:20:19 +00:00

..

freestyle

Fix for the Selection by Image Border not working properly.

2012-02-05 18:42:51 +00:00

modules

more face -> tessface edits

2012-03-23 01:10:41 +00:00

presets

== Sequencer ==

2012-03-21 18:02:29 +00:00

startup

Merged changes in the trunk up to revision 45133.

2012-03-25 08:20:19 +00:00

templates

patch [#30620] Wiki Quick Hack: Make Tooltip Text Colour Themeable

2012-03-22 20:24:11 +00:00