Daniel Genrich 11ec880483 Clean up merging conflict

2008-09-03 16:10:20 +00:00

..

avi

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

blenkernel

svn merge -r 16222:16320 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-31 21:00:20 +00:00

blenlib

Removed cast warnings from shrinkwrap.c and BLI_kdopbvh.c

2008-08-22 18:28:34 +00:00

blenloader

svn merge -r 16060:16222 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-22 09:31:32 +00:00

blenpluginapi

svn merge -r 16077:16174 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-18 14:33:26 +00:00

ftfont

Suggestion by GSR; move "extern C" into header file, remove "_" from

2008-04-25 19:18:24 +00:00

imbuf

svn merge -r 16077:16174 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-18 14:33:26 +00:00

include

== Grease Pencil Conversions - Armature ==

2008-08-31 12:47:04 +00:00

makesdna

Clean up merging conflict

2008-09-03 16:10:20 +00:00

nodes

svn merge -r 15688:15908 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-01 21:37:36 +00:00

python

A bit of cleanup of warnings (gcc).

2008-08-22 12:10:02 +00:00

quicktime

Merge from trunk

2008-05-05 17:30:33 +00:00

radiosity

svn merge -r 16077:16174 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-18 14:33:26 +00:00

readblenfile

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

render

svn merge -r 16222:16320 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-31 21:00:20 +00:00

src

svn merge -r 16222:16320 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-31 21:00:20 +00:00

verify

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

yafray

svn merge -r 16077:16174 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2008-08-18 14:33:26 +00:00

CMakeLists.txt

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

Makefile

Patch from GSR that a) fixes a whole bunch of GPL/BL license

2008-04-16 22:40:48 +00:00

SConscript

Filling in branch from trunk

2007-11-06 22:29:20 +00:00