Tamito Kajiyama 55015daa43 Merged changes in the trunk up to revision 51448. ... Conflicts resolved: source/blender/blenkernel/CMakeLists.txt source/blender/blenloader/intern/readfile.c source/blender/editors/mesh/editmesh_tools.c source/blender/makesrna/intern/rna_main_api.c		2012-10-20 16:48:48 +00:00
..
bin	Workaround for half-transparent windows when running blender-softwaregl	2011-11-15 07:28:18 +00:00
datafiles	Google Summer of Code project: "Smoke Simulator Improvements & Fire".	2012-10-10 13:18:07 +00:00
freedesktop	patch to our desktop file from debian, German translation.	2012-04-16 09:56:12 +00:00
scripts	Merged changes in the trunk up to revision 51448.	2012-10-20 16:48:48 +00:00
text	Merged changes in the trunk up to revision 50829.	2012-09-23 18:50:56 +00:00
windows	code cleanup: check for msvc directly when using warning pragma's.	2012-10-15 02:15:07 +00:00
environment-macosx	shapekeys are now stored as customdata in editmode, so edit operations like subdivide work (mostly) correctly. tesselated faces now store correct normals in more situations. and added more missing files from the last merge, there may be more though.	2009-11-02 06:33:16 +00:00
environment-mswindows	set svn end of lines to native	2011-05-09 08:15:38 +00:00
environment-unix	shapekeys are now stored as customdata in editmode, so edit operations like subdivide work (mostly) correctly. tesselated faces now store correct normals in more situations. and added more missing files from the last merge, there may be more though.	2009-11-02 06:33:16 +00:00