Merge remote-tracking branch 'bnf/buffer.release-2'

Conflicts:
	compositor/compositor.h

diff --cc compositor/compositor.c
Simple merge

diff --cc compositor/compositor.h
index d68eb9a,2b7c11d..4f03062
--- 1/compositor/compositor.h
--- 2/compositor/compositor.h
+++ b/compositor/compositor.h
@@@ -72,11 -65,8 +72,13 @@@ struct wlsc_output 
        int repaint_needed;
        int finished;
  
 +      char *make, *model;
 +      uint32_t subpixel;
 +      
 +      struct wlsc_mode *current;
 +      struct wl_list mode_list;
+       struct wl_buffer *scanout_buffer;
+       struct wl_listener scanout_buffer_destroy_listener;
  
        int (*prepare_render)(struct wlsc_output *output);
        int (*present)(struct wlsc_output *output);