Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 28 Dec 2013 19:00:20 +0000 (14:00 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 28 Dec 2013 19:00:20 +0000 (14:00 -0500)
1  2 
gtk2_ardour/editor.cc
libs/ardour/ardour/audio_buffer.h
libs/ardour/ardour/buffer.h
libs/ardour/ardour/buffer_set.h

Simple merge
Simple merge
Simple merge
Simple merge