Tamito Kajiyama e91f33101f Merged changes in the trunk up to revision 50956. ... Conflicts resolved: source/blender/editors/interface/resources.c		2012-09-30 13:16:55 +00:00
..
config	code cleanup: correct spelling	2012-09-28 06:45:20 +00:00
tools	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00