3 Commits

Author	SHA1	Message	Date
Andre Susano Pinto	289d875dfd	svn merge -r 15688:15908 https://svn.blender.org/svnroot/bf-blender/trunk/blender	2008-08-01 21:37:36 +00:00
Andre Susano Pinto	8d94bfec1b	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)	2008-07-15 21:08:39 +00:00
Andre Susano Pinto	afc30d1a33	There was a problem with the last merge :S ... Somehow it didnt finished and didnt added some files under the svn control (found thanks to lguillaume that reported some files were missing) Last merge fixed and also merged modifications up to revision 15584. I checked the diff svn diff --new . --old https://svn.blender.org/svnroot/bf-blender/trunk/blender And everything seems to be right now	2008-07-15 12:54:57 +00:00