projects / profile / ivi / weston.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f0ce05 fb4b5a2)
Merge remote-tracking branch 'bnf/fixes-2'
authorKristian Høgsberg <krh@bitplanet.net>
Tue, 21 Jun 2011 15:31:38 +0000 (11:31 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 21 Jun 2011 15:31:38 +0000 (11:31 -0400)
1  2 
compositor/compositor.c patch | diff1 | diff2 | blob | history

diff --cc compositor/compositor.c
Simple merge
Domain: Graphics System / Display Server;