Tamito Kajiyama 1f7ae143a2 Merged changes in the trunk up to revision 48227. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/editors/space_file/filelist.c		2012-06-24 10:29:26 +00:00
..
freestyle	Fix for the WithinImageBorderUP1D predicate not working with a ViewEdge such that	2012-05-28 23:53:28 +00:00
modules	add in convenience var 'D = bpy.data' - to the python console, add note for C, D - in initial message.	2012-06-20 08:49:59 +00:00
presets	SVN maintenance.	2012-06-23 02:10:54 +00:00
startup	Merged changes in the trunk up to revision 48227.	2012-06-24 10:29:26 +00:00
templates	minor fixes	2012-06-11 12:13:41 +00:00