3 Commits

Author	SHA1	Message	Date
Tamito Kajiyama	be50ce61be	Merged ... https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338) with the "Ignore ancestry" and "Ignore line endings" options enabled (using TortoiseSVN on Windows). After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/ were reverted in order to keep the primary source tree of the Freestyle renderer.	2009-09-18 22:25:49 +00:00
Nathan Letwory	9f73fe008c	==SCons== ... * Small CVS surgery, winblender_scons.rc renamed to winblender.rcscons on repository and change also in this SConscript. In case it was not yet clear as why there is a second resource file with the same icons: the SCons RES() function needs the paths to be able to generate the proper resource object. Change suggested by Joseph Eagar to prevent problems with the Makefiles.	2006-03-10 22:50:27 +00:00
Nathan Letwory	52dfa31cb8	==SCons== ... + Joseph Eagar provided a patch that re-enables the application icon for Blender. Hurray!	2006-03-10 20:47:34 +00:00