Conflicts:

	configure.ac
	po/POTFILES.in
	src/Makefile.am
	src/ar-clutter-embed.c
	src/board.c
	src/card.c
	src/game.c
	src/lib/Makefile.am
	src/slot-renderer.c

Conflicts:
	po/POTFILES.in
	src/Makefile.am
	src/ar-clutter-embed.c
	src/window.c