Michel Dänzer 4334860e69 Merge branch 'master' into exa-damagetrack ...

Conflicts:

	exa/exa_accel.c
	exa/exa_migration.c

2006-12-19 16:29:26 +01:00

..

damage.c

…

damage.h

…

damagestr.h

…

Makefile.am

…