Merge with trunk r36987.
authorJoerg Mueller <nexyon@gmail.com>
Sun, 29 May 2011 00:48:03 +0000 (00:48 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Sun, 29 May 2011 00:48:03 +0000 (00:48 +0000)
commit9cfd093a934097a3054f89b70168fa6ed5be695e
treec9212d55e88b7d626c108894c2113eed29513d5b
parent07dca944766e702453730fe1a55605dab9380c6e
parentfc3904d7b3189e4d201666464d71feba1619a36e
Merge with trunk r36987.
release/scripts/startup/bl_ui/properties_object_constraint.py
source/blender/makesrna/intern/rna_constraint.c