Tamito Kajiyama 003ab20292 Merged changes in the trunk up to revision 35618. ... Conflicts resolved: source/blender/makesrna/RNA_types.h source/blender/makesrna/intern/rna_main_api.c		2011-03-19 00:05:30 +00:00
build_files	Mac OS X cmake changes and bundle fixes	2011-03-16 15:44:17 +00:00
doc	Merged changes in the trunk up to revision 35618.	2011-03-19 00:05:30 +00:00
extern	workaround for problem compiling with glu 1.5.8 on windows	2011-03-15 01:31:07 +00:00
intern	Fix [#25480] Unable to use Windows titlebar icons after Loopcut	2011-03-18 21:59:45 +00:00
release	Merged changes in the trunk up to revision 35618.	2011-03-19 00:05:30 +00:00
source	Merged changes in the trunk up to revision 35618.	2011-03-19 00:05:30 +00:00
CMakeLists.txt	fix for building on ubuntu 11.04 (pre-release), also remove WITH_INSTALL from cache.	2011-03-18 12:12:53 +00:00
COPYING	== docs ==	2010-10-13 14:44:22 +00:00
GNUmakefile	Mac OS X cmake changes and bundle fixes	2011-03-16 15:44:17 +00:00
SConstruct	Check the os.environ at the start of the build process.	2011-02-18 09:39:15 +00:00