Lukas Tönne 046510fcf9 Merge branch 'hair_immediate_fixes' into gooseberry ...

Conflicts:
	source/blender/physics/intern/BPH_mass_spring.cpp

2015-01-20 09:30:07 +01:00

..

intern

Merge branch 'hair_immediate_fixes' into gooseberry

2015-01-20 09:30:07 +01:00

BLO_blend_defs.h

code cleanup: split out defines in BKE_utildefines.h into BLO_blend_defs.h and ui defines in interface_intern.h

2012-09-03 10:12:25 +00:00

BLO_readfile.h

Cleanup: unused Global flags.

2015-01-20 01:07:12 +11:00

BLO_runtime.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

BLO_undofile.h

code cleanup: use const args for writing files.

2012-04-17 19:51:40 +00:00

BLO_writefile.h

code cleanup: use const args for writing files.

2012-04-17 19:51:40 +00:00

CMakeLists.txt

Move do-versions functions for 2.70

2014-03-06 04:40:49 +11:00

SConscript

"Render Audio" cleanup:

2013-11-07 13:32:32 +00:00