Compile error with exa-damagetrack branch

[Michel Dänzer]

On Tue, 2006-10-17 at 11:20 +0200, Michel Dänzer wrote:
> On Tue, 2006-10-17 at 13:38 +1000, Daniel Kasak wrote:
> > 
> > exa_migration.c:507: error: 'data_row_bytes' undeclared (first use in
> > this function)
> 
> exa_migration.c doesn't contain the string data_row_bytes on
> exa-damagetrack. Does git-diff show any local modifications?

Or, if you ran git-pull with exa-damagetrack checked out, it merged in
the master branch, and you apparently didn't resolve the merge conflict
in exa_migration.c correctly (you should just keep the exa-damagetrack
bits).


-- 
Earthling Michel Dänzer           |          http://tungstengraphics.com
Libre software enthusiast         |          Debian, X and DRI developer