Fixed conflicts
authorMateu Batle <mateu.batle@collabora.co.uk>
Fri, 9 Apr 2010 21:04:22 +0000 (16:04 -0500)
committerMateu Batle <mateu.batle@collabora.co.uk>
Fri, 9 Apr 2010 21:04:22 +0000 (16:04 -0500)
commite99ea0d0a2fd4c986f9f69e14f127d20241771af
tree26b947baaac9af226c142066d570722432464613
parentffa96ccb4622955030aa093b55a48706ce34a0d2
Fixed conflicts
src/image.h