projects / profile / ivi / weston.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9747d0 32bed57)
Merge branch 'layers'
authorKristian Høgsberg <krh@bitplanet.net>
Fri, 2 Mar 2012 13:14:40 +0000 (08:14 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Fri, 2 Mar 2012 13:14:40 +0000 (08:14 -0500)
I was integrating patches on the 'layers' branch and had a fixed version of
the fullscreen patch there.  My master branch had the fullscreen patch with
the resize bug, and when I pushed I meant to push the layers branch to master.

Conflicts:
src/shell.c


Trivial merge
Domain: Graphics System / Display Server;