Merge remote-tracking branch 'pq/shell-priv'
authorKristian Høgsberg <krh@bitplanet.net>
Wed, 23 Nov 2011 15:40:11 +0000 (10:40 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Wed, 23 Nov 2011 15:40:11 +0000 (10:40 -0500)
commitf6def545bc1504fd02602cac4ced4d305e61f3d2
tree8f1b74f054e1faa3f806fdafd14fcd4116937675
parenta8873120c40d587e9bd9691cdf9c51ff049ea5ee
parent57da4a822e4ae2b498c1e6915a9f5def04af84ea
Merge remote-tracking branch 'pq/shell-priv'
compositor/compositor.c
compositor/compositor.h
compositor/shell.c