projects / profile / ivi / clutter.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0dfd8a 938fcc6)
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)
1  2 
tests/conform/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc tests/conform/Makefile.am
Simple merge
Domain: Graphics System / Rendering Engine;