Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Mon, 14 Nov 2011 03:40:49 +0000 (11:40 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Mon, 14 Nov 2011 03:40:49 +0000 (11:40 +0800)
1  2 
clutter/Makefile.am
clutter/win32/clutter-backend-win32.c
configure.ac

Simple merge
Simple merge
diff --cc configure.ac
Simple merge