Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Thu, 6 Oct 2011 04:04:30 +0000 (12:04 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Thu, 6 Oct 2011 04:04:30 +0000 (12:04 +0800)
commitb55656b6984a6a5f2dd9d12d6adac09efc9b8595
tree18cb8addd226ee2dda4ddae8aea57e1ce9310d58
parentf0dfd8ab07809ae54667e5dcea581f429d476d2f
parent938fcc60f0365db5dbcc4677ba5e7cefbccf22c8
Merge branch 'master' into msvc-support-master
tests/conform/Makefile.am