moved more minor changes across from trunk, fixed some incorrect merges and removed unused includes.

2011-05-09 06:53:39 +00:00
parent c8e2df0128
commit f5bcf9211d
22 changed files with 16 additions and 43 deletions
--- a/source/blender/blenkernel/intern/fluidsim.c
+++ b/source/blender/blenkernel/intern/fluidsim.c
@@ -67,6 +67,7 @@

 /* ************************* fluidsim bobj file handling **************************** */

+
 //-------------------------------------------------------------------------------
 // file handling
 //-------------------------------------------------------------------------------