fix for errors with merge
authorCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 08:18:20 +0000 (08:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 08:18:20 +0000 (08:18 +0000)
commitdbe2fe5043b99f8a5717bbe5b6a9e36a6519f8c7
tree17a9117ca6d4b1f728196cc22e802c0a13cf9a67
parentad1d3dd30fa5f4c33279679e3824899fd18801b8
fix for errors with merge
source/blender/blenlib/intern/BLI_ghash.c
source/creator/creator.c