misc changes from trunk (avoid confusion since these were not intentional differences) bmesh
authorCampbell Barton <ideasman42@gmail.com>
Sun, 19 Feb 2012 18:41:30 +0000 (18:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 19 Feb 2012 18:41:30 +0000 (18:41 +0000)
1  2 
release/scripts/modules/bpy_types.py
source/blender/collada/MeshImporter.cpp

Simple merge