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)
1  2 
compositor/compositor.c
compositor/compositor.h
compositor/shell.c

Simple merge
Simple merge
Simple merge