Tamito Kajiyama 0ca96e1eb1 Merged changes in the trunk up to revision 41768. ... Conflicts resolved: source/blender/makesdna/intern/makesdna.c source/blender/makesrna/RNA_enum_types.h source/blender/render/intern/source/shadeinput.c source/blenderplayer/bad_level_call_stubs/stubs.c Additional changes: * source/blender/makesrna/intern/rna_linestyle.c: Fixed white space issues that generated a number of compiler errors. The problem was that two string literals for enumerating MA_RAMP_SOFT and MA_RAMP_LINEAR contained a space. The string literals are supposed to represent a valid C identifier because of their use for automatic code generation. * Stroke transparency has been temporarily disabled due to a functionality conflict with some merged changes. A fix of this issue is planned.		2011-11-12 23:12:30 +00:00
..
brushicons	re-compress png's (save some space)	2011-04-21 10:03:45 +00:00
fonts	Fix #29198: Problem with text interface when you enable the International fonts	2011-11-08 15:12:41 +00:00
.Bfont	Initial commit of 'release'.	2003-01-01 15:11:07 +00:00
bfont.ttf	* Added the bfont TTF itself, along with the source of my changes for lighter	2006-10-12 03:10:14 +00:00
bmonofont.ttf	2.5: Text Editor back.	2009-02-28 23:33:35 +00:00
ctodata.py	pep8 cleanup and remove unused vars/imports	2011-02-17 04:35:41 +00:00
datatoc.py	fix for some pedantic warnings.	2010-12-03 01:52:28 +00:00
DejaVuSans-Lite.sfd.bz2	* Added the bfont TTF itself, along with the source of my changes for lighter	2006-10-12 03:10:14 +00:00
LICENSE-bfont.ttf.txt	Remove some more $Id$ that still were left after r41227 and r41228.	2011-10-23 19:01:59 +00:00
preview.blend	Colour Management	2009-07-17 02:43:15 +00:00
prvicons	Part two of 2.56 beta, VERSION for make and splash itself.	2010-12-29 19:05:58 +00:00
splash.png	* Re-commit splash screen with Alpha header.	2011-10-22 16:01:19 +00:00