Merge trunk with branch
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Wed, 30 Apr 2008 18:14:27 +0000 (18:14 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Wed, 30 Apr 2008 18:14:27 +0000 (18:14 +0000)
commit10ce8e3281807c683ee6283548d09a0984eb398d
treeaa7b6bf55512927a501b431f6283662c6c28a4f9
parent29f0f74b05462e9bd0b641602b89fa1c39ed29c8
parent93ba2dd6a1b5a841a49469e12a3671957e6a3500
Merge trunk with branch
svn merge -r 14551:14626 https://svn.blender.org/svnroot/bf-blender/trunk/blender
release/datafiles/splash.jpg
source/blender/src/splash.jpg.c