projects / profile / ivi / clutter.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d3a9bf2 ebf12a8)
Merge branch 'master' into msvc-support-master
authorChun-wei Fan <fanchunwei@src.gnome.org>
Thu, 17 Nov 2011 14:17:01 +0000 (22:17 +0800)
committerChun-wei Fan <fanchunwei@src.gnome.org>
Thu, 17 Nov 2011 14:17:01 +0000 (22:17 +0800)
1  2 
tests/interactive/Makefile.am patch | diff1 | diff2 | blob | history

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