Merge branch 'master' into msvc-support-master

author Chun-wei Fan <fanchunwei@src.gnome.org>

Mon, 17 Oct 2011 07:52:57 +0000 (15:52 +0800)

committer Chun-wei Fan <fanchunwei@src.gnome.org>

Mon, 17 Oct 2011 07:52:57 +0000 (15:52 +0800)
author Chun-wei Fan <fanchunwei@src.gnome.org>
Mon, 17 Oct 2011 07:52:57 +0000 (15:52 +0800)
committer Chun-wei Fan <fanchunwei@src.gnome.org>
Mon, 17 Oct 2011 07:52:57 +0000 (15:52 +0800)
diff --cc clutter/win32/clutter-backend-win32.c
Simple merge
diff --cc configure.ac
Simple merge
diff --cc po/POTFILES.in
Simple merge
diff --cc tests/conform/Makefile.am
Simple merge
diff --cc tests/interactive/Makefile.am
Simple merge
author	Chun-wei Fan <fanchunwei@src.gnome.org>
	Mon, 17 Oct 2011 07:52:57 +0000 (15:52 +0800)
committer	Chun-wei Fan <fanchunwei@src.gnome.org>
	Mon, 17 Oct 2011 07:52:57 +0000 (15:52 +0800)
		1	2
clutter/win32/clutter-backend-win32.c	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
po/POTFILES.in	patch \|	diff1 \|	diff2 \|	blob \| history
tests/conform/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
tests/interactive/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history