Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Wed, 12 Oct 2011 06:37:19 +0000 (14:37 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Wed, 12 Oct 2011 06:37:19 +0000 (14:37 +0800)
1  2 
clutter/Makefile.am
configure.ac

Simple merge
diff --cc configure.ac
Simple merge