Tamito Kajiyama 4ea2fb8b0a Merged changes in the trunk up to revision 49478. ... Conflicts resolved: source/blender/blenkernel/intern/library.c source/blender/blenloader/intern/readfile.c source/blender/editors/interface/resources.c source/blender/makesrna/intern/rna_scene.c		2012-08-02 00:10:05 +00:00
..
libmv	Code cleanup: silence some -Wnarrowing warnings from C++11	2012-08-01 15:02:09 +00:00
patches	Remove unneeded and unused patch for libmv	2012-05-09 12:30:15 +00:00
third_party	Merged changes in the trunk up to revision 49478.	2012-08-02 00:10:05 +00:00
bundle.sh	Initial Ceres integration into Blender	2012-06-10 15:27:41 +00:00
ChangeLog	Synchronize libmv with changes in git branch	2012-05-10 10:39:28 +00:00
CMakeLists.txt	Planar tracking support for motion tracking	2012-06-10 15:28:19 +00:00
files.txt	libmv: bundle new upstream version of libmv from own branch	2012-04-14 12:02:39 +00:00
libmv-capi.cpp	Masking support for motion tracks	2012-06-12 11:13:53 +00:00
libmv-capi.h	Masking support for motion tracks	2012-06-12 11:13:53 +00:00
mkfiles.sh	Initial Ceres integration into Blender	2012-06-10 15:27:41 +00:00
SConscript	Initial Ceres integration into Blender	2012-06-10 15:27:41 +00:00