svn merge -r 22571:22800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / COPYING
1 Please read over both of the following files:
2 doc/GPL-license.txt
3 doc/BL-license.txt