Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 8 Nov 2011 16:30:32 +0000 (00:30 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Tue, 8 Nov 2011 16:30:32 +0000 (00:30 +0800)
1  2 
clutter/Makefile.am

Simple merge