projects / platform / upstream / weston.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f6a5f7d 43c61d8)
Merge remote-tracking branch 'pq/compositor-dtors-v1'
authorKristian Høgsberg <krh@bitplanet.net>
Tue, 3 Jan 2012 16:29:15 +0000 (11:29 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 3 Jan 2012 16:36:37 +0000 (11:36 -0500)
commit3466bc8042591ad46082afeeb7a0cd1e5c08e130
treee95624e350fb7ce8769c21c43f9a3913068b441dtree | snapshot
parentf6a5f7def3d31305c142881696c674f6fbc7518dcommit | diff
parent43c61d83735a5fe3b6284451cb9383d3c2aa005ccommit | diff
Merge remote-tracking branch 'pq/compositor-dtors-v1'

This collided with the big weston rename, but git did a good job of fixing
most cases.

Conflicts:
compositor/compositor.h
src/compositor-x11.c
src/compositor.c
src/screenshooter.c
src/util.c
src/compositor-x11.c diff1 | diff2 | blob | history
src/compositor.c diff1 | diff2 | blob | history
src/compositor.h diff1 | | blob | history
src/screenshooter.c diff1 | diff2 | blob | history
src/shell.c diff1 | diff2 | blob | history
src/tablet-shell.c diff1 | diff2 | blob | history
src/util.c diff1 | diff2 | blob | history
Domain: Graphics System / Display Server;