[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17343] branches/etch-a-ton: merging 17300 :17342

[Martin Poirier]

--- On Wed, 11/5/08, Martin Poirier <theeth at yahoo.com> wrote:

> From: Martin Poirier <theeth at yahoo.com>
> Subject: [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17343] branches/etch-a-ton: merging 17300 :17342
> To: bf-blender-cvs at blender.org
> Date: Wednesday, November 5, 2008, 8:30 PM
> Revision: 17343
>          
> http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17343
> Author:   theeth
> Date:     2008-11-06 02:30:24 +0100 (Thu, 06 Nov 2008)
> 
> Log Message:
> -----------
> merging 17300:17342

In case other people have trouble merging because of line ending differences, here's what I did:

http://pasteall.org/3072

In a nutshell, remove offending files, merge, copy them back from trunk (there's approximatively 0% chance that you had modifications in them anyway).

Martin