[Crystal-develop] Merge trunk commit

[Alexandru V. <voi...@gm...>]

Hello,

After merging the hair branch with the trunk via: 'python svnmerge.py merge
-S /CS/trunk r1-34587' and committing, it appears that there were some files
modified in the trunk as well.
When I diff between r34595 and r34594 I get:

https://crystal.svn.sourceforge.net/svnroot/crystal/CS/trunk

data/bias/models/iceblocks/factories/gibs    Deleted
data/bias/models/iceblocks/factories/gengibs    Added
data/bias/models/iceblocks...\skelArmature.001    Modified
data/bias/models/iceblocks/gibs    Modified

I haven't committed anything on the trunk branch though, and I am not sure
if my user even has permission to do that.
However if the modification occurred should I revert to r34594 and commit
(if it works)?

Alex.