projects / profile / ivi / weston.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67a201d 08c40c3)
Merge branch 'master' of git://anongit.freedesktop.org/wayland
authorCallum Lowcay <callum@callumscode.com>
Wed, 12 Jan 2011 06:40:14 +0000 (19:40 +1300)
committerCallum Lowcay <callum@callumscode.com>
Wed, 12 Jan 2011 06:40:14 +0000 (19:40 +1300)
Conflicts:
clients/terminal.c

1  2 
clients/terminal.c patch | diff1 | diff2 | blob | history

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