Tamito Kajiyama 16702c1729 Merged changes in the trunk up to revision 41225. ... Conflicts resolved: source/blender/render/intern/source/pipeline.c		2011-10-29 15:46:14 +00:00
..
bin	- remove release/bin/.blender/.bfont.ttf, we have ./release/datafiles/bfont.ttf already, and its not used anymore.	2011-10-21 03:16:01 +00:00
datafiles	* Re-commit splash screen with Alpha header.	2011-10-22 16:01:19 +00:00
freedesktop	synched with trunk at revision 36569	2011-05-16 20:30:59 +00:00
plugins	converted more mixed tab/space indentations to tabs. only whitespace changes.	2011-04-21 15:53:30 +00:00
scripts	Merged changes in the trunk up to revision 41225.	2011-10-29 15:46:14 +00:00
text	* Updating readme.html and link to release logs for 2.60, now that we approach the RC state.	2011-10-01 11:21:47 +00:00
windows	Fix #27481: windows uninstaller could remove files unrelated to blender	2011-06-01 13:13:55 +00:00
environment-macosx
environment-mswindows	set svn end of lines to native	2011-05-09 08:15:38 +00:00
environment-unix