Tamito Kajiyama 55015daa43 Merged changes in the trunk up to revision 51448. ...

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesrna/intern/rna_main_api.c

2012-10-20 16:48:48 +00:00

..

freestyle

Fix for the WithinImageBorderUP1D predicate not working with a ViewEdge such that

2012-05-28 23:53:28 +00:00

modules

Remove six languages from Blender UI (rational: very low level of translation, 1-2% at most, and no commit done in branch since more than one year): fi (Finnish), ca (Catalan), bg (Bulgarian), el (Greek), ne (Nepali) and pl (Polish).

2012-10-20 08:52:54 +00:00

presets

Fix #32780: Maya keymap selection issues

2012-10-10 08:07:28 +00:00

startup

Merged changes in the trunk up to revision 51448.

2012-10-20 16:48:48 +00:00

templates

minor changes

2012-10-17 16:10:04 +00:00