Bastien Montagne 7b7ba9ba07 Reverting changes from r55873 for rna_define.c, sorry about that... ... svn merge -r55873:55872 ./source/blender/makesrna/intern/rna_define.c		2013-04-07 10:25:59 +00:00
build_files	Missing build_files updates in the merger in revision 55847.	2013-04-07 06:44:33 +00:00
doc	Missing updates in the doc/ and intern/ folders during the merger in revision 55847.	2013-04-07 06:56:49 +00:00
extern	Revert change made to bilinear sampler in libmv	2013-04-06 14:47:45 +00:00
intern	Cycles UI:	2013-04-07 08:42:08 +00:00
release	Freestyle UI:	2013-04-07 10:23:48 +00:00
source	Reverting changes from r55873 for rna_define.c, sorry about that...	2013-04-07 10:25:59 +00:00
CMakeLists.txt	svn merge ^/trunk/blender -r55700:55776	2013-04-04 13:37:07 +00:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	correct too-big allocation in mesh beautify.	2013-04-01 07:57:33 +00:00
SConstruct	Merged changes in the trunk up to revision 55546.	2013-03-24 12:13:13 +00:00