Tamito Kajiyama ed0e2fbd9f Merged changes in the trunk up to revision 52690. ... Conflicts resolved: release/datafiles/startup.blend source/blender/blenlib/intern/bpath.c		2012-12-01 02:47:59 +00:00
..
config	switch verious references from py3.2 -> 3.3 or just 3.	2012-11-26 13:58:06 +00:00
tools	Merged changes in the trunk up to revision 52690.	2012-12-01 02:47:59 +00:00