Commit Graph

4 Commits

Author SHA1 Message Date
Andre Susano Pinto
656ee61718 Merge from trunk
(The last time there was some files missing due to failed connection to svn server while merging.. thats why this stuff of reverting last merge and redoing it)

svn merge -r 16231:16608 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2008-09-19 14:15:36 +00:00
Andre Susano Pinto
2f9f0710d1 Revert last merge from trunk
svn merge -r 16539:16538 https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-jaguarandi/
2008-09-19 12:05:45 +00:00
Andre Susano Pinto
a1d611e9bd svn merge -r 16231:16536 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-09-15 14:20:31 +00:00
Andre Susano Pinto
2ce338f7e8 svn merge -r 16077:16174 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-08-18 14:33:26 +00:00