Blender Git Loki
Git Commits -> Revision 6d24919
Revision 6d24919 by Jason Wilkins (soc-2010-jwilkins) July 6, 2010, 12:32 (GMT) |
more merge fixes |
Commit Details:
Full Hash: 6d24919407465c406101cd780f3c72b1bcb76f94
SVN Revision: 30034
Parent Commit: bab7ecd
Lines Changed: +102, -54
17 Modified Paths:
/intern/ghost/GHOST_Path-api.h (+1, -1) (Diff)
/intern/ghost/intern/GHOST_Path-api.cpp (+1, -1) (Diff)
/release/scripts/io/export_3ds.py (+2, -1) (Diff)
/release/scripts/io/import_scene_3ds.py (+7, -2) (Diff)
/release/scripts/op/object.py (+1, -1) (Diff)
/release/scripts/op/object_align.py (+2, -2) (Diff)
/release/scripts/op/uvcalc_smart_project.py (+1, -1) (Diff)
/release/scripts/ui/properties_data_curve.py (+9, -11) (Diff)
/release/scripts/ui/properties_object.py (+5, -4) (Diff)
/release/scripts/ui/properties_object_constraint.py (+1, -0) (Diff)
/release/scripts/ui/properties_physics_cloth.py (+1, -1) (Diff)
/release/scripts/ui/properties_physics_common.py (+1, -1) (Diff)
/release/scripts/ui/properties_render.py (+3, -4) (Diff)
/release/scripts/ui/properties_scene.py (+0, -2) (Diff)
/release/scripts/ui/space_sequencer.py (+2, -1) (Diff)
/release/scripts/ui/space_userpref_keymap.py (+4, -8) (Diff)
/release/scripts/ui/space_view3d.py (+61, -13) (Diff)
/intern/ghost/intern/GHOST_Path-api.cpp (+1, -1) (Diff)
/release/scripts/io/export_3ds.py (+2, -1) (Diff)
/release/scripts/io/import_scene_3ds.py (+7, -2) (Diff)
/release/scripts/op/object.py (+1, -1) (Diff)
/release/scripts/op/object_align.py (+2, -2) (Diff)
/release/scripts/op/uvcalc_smart_project.py (+1, -1) (Diff)
/release/scripts/ui/properties_data_curve.py (+9, -11) (Diff)
/release/scripts/ui/properties_object.py (+5, -4) (Diff)
/release/scripts/ui/properties_object_constraint.py (+1, -0) (Diff)
/release/scripts/ui/properties_physics_cloth.py (+1, -1) (Diff)
/release/scripts/ui/properties_physics_common.py (+1, -1) (Diff)
/release/scripts/ui/properties_render.py (+3, -4) (Diff)
/release/scripts/ui/properties_scene.py (+0, -2) (Diff)
/release/scripts/ui/space_sequencer.py (+2, -1) (Diff)
/release/scripts/ui/space_userpref_keymap.py (+4, -8) (Diff)
/release/scripts/ui/space_view3d.py (+61, -13) (Diff)