Merge remote-tracking branch 'bnf/buffer.release-2'
authorKristian Høgsberg <krh@bitplanet.net>
Tue, 21 Jun 2011 17:10:01 +0000 (13:10 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Tue, 21 Jun 2011 17:10:01 +0000 (13:10 -0400)
commitec138901c1c7537dfa4f4575357db05bc5b30d8b
tree3cf99d1d2603c30ab47e8ef92c2fd17d0a433250
parent2468692c9f375732b38fa14db8b02c4643277507
parent0628626d5546d0ad684667a1250778fbadab21b1
Merge remote-tracking branch 'bnf/buffer.release-2'

Conflicts:
compositor/compositor.h
compositor/compositor.c
compositor/compositor.h