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)
1  2 
tests/conform/test-cogl-materials.c
tests/conform/test-cogl-pixel-buffer.c
tests/micro-bench/test-picking.c

Simple merge
Simple merge