Merge branch 'setup_display' of git://anongit.freedesktop.org/~bnf/wayland
authorKristian Høgsberg <krh@bitplanet.net>
Tue, 1 Mar 2011 22:04:33 +0000 (17:04 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 1 Mar 2011 22:04:33 +0000 (17:04 -0500)
commit9061f91eb8252e1e414365df7e909093932235ac
tree8f3f22bbd06b882d94825595f9ab30789ca3c130
parent8105d2873cd24c3632a6f1263935d3461279b8de
parentb038d93abf9c448e4edcd98aa3d488186bde7586
Merge branch 'setup_display' of git://anongit.freedesktop.org/~bnf/wayland