Merging r42413 through r42441 form trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 5 Dec 2011 18:53:09 +0000 (18:53 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 5 Dec 2011 18:53:09 +0000 (18:53 +0000)
commitf55f9e95db44838130a18f80b33bd77f58e8a987
tree502ddd00634c4ec1a2098337f4ec1f524bfc4a73
parent9e51f4b94368a612c5561f20f4b44f858ab5318e
parentc40d8921b8b61c0465a2fe9bca72dc418bf39c7d
Merging r42413 through r42441 form trunk into soc-2011-tomato
extern/libmv/libmv-capi.cpp
extern/libmv/libmv/tracking/brute_region_tracker.cc
source/blender/blenkernel/intern/tracking.c