Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Mon, 17 Oct 2011 07:52:57 +0000 (15:52 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Mon, 17 Oct 2011 07:52:57 +0000 (15:52 +0800)
commitb1780711f75fe9a36e95cc1d8599508d2d7d3352
tree2fe7a4cc09a07adfd84c7afca5cc7afccec7c732
parent0ee89f1788efaef7d948aa03e0004780a310bd90
parentf75dfcfd8b2e17862614eb6e0722a61c34e0dcde
Merge branch 'master' into msvc-support-master
clutter/win32/clutter-backend-win32.c
configure.ac
po/POTFILES.in
tests/conform/Makefile.am
tests/interactive/Makefile.am