misc changes from trunk (avoid confusion since these were not intentional differences)
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)
commitdc68210c7e432cf313721541e639426dd94f2dfb
tree4fb676fa675c304d6594264cc9c1417967d15ff5
parent51488283564273c5e796d5ca3ded47f2726330e8
parentd6deca4e9d6bc7faff98644286571c7934324a9d
misc changes from trunk (avoid confusion since these were not intentional differences)
release/scripts/modules/bpy_types.py
source/blender/collada/MeshImporter.cpp