diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-07-16 01:08:39 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-07-16 01:08:39 +0400 |
| commit | 8d94bfec1b9f692474d74441ec92ef5d3765e8e5 (patch) | |
| tree | 74e10c4aea690c6fc3e068b43c7fe3b8125f0c67 /source/blender/blenkernel/BKE_shrinkwrap.h | |
| parent | afc30d1a33506d8c0fb08f6b2df7856071383430 (diff) | |
Last commit fixed the file contents.. but some svn props were missing.
So I fixed the problem with merges instead of copying files over.
Also trunk/blender/release/scripts/scripttemplate_ipo_gen.py from revision 14530 was missing. (that was fixed)
svn merge -r 15590:15551 https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-jaguarandi (revert changes to the point where the merge was incorrect)
svn merge -r 15552:15572 https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-jaguarandi (apply branch modifications)
svn merge -r 15392:15590 https://svn.blender.org/svnroot/bf-blender/trunk/blender (merge from trunk)
Diffstat (limited to 'source/blender/blenkernel/BKE_shrinkwrap.h')
0 files changed, 0 insertions, 0 deletions