Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Mon, 14 Nov 2011 14:57:50 +0000 (22:57 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Mon, 14 Nov 2011 14:57:50 +0000 (22:57 +0800)
commit96d4e527ea8bf0e7fd238ba6cafd578f86fea27f
tree2d0be84fcc3c86933dac7313700f7a6ebe6574ec
parent2628ba70cdd8dccd90a487466b42f0fe136f6860
parente7720c415649cb67453b90764258f398f8e97107
Merge branch 'master' into msvc-support-master
tests/conform/test-cogl-materials.c
tests/conform/test-cogl-pixel-buffer.c
tests/micro-bench/test-picking.c