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)
commitb880a381523b2cfdb7ebd17c27fff1adf90fa028
treec1328784a717c5af8e556ac0414969276b7e6c2c
parent2d389a23d5738b0670ead38c45c99afbdecc4d85
parent5bc8750f73c7b4f4d4fe2c15831862c2bfd8250a
Merge branch 'master' into cairocanvas
gtk2_ardour/editor.cc
libs/ardour/ardour/audio_buffer.h
libs/ardour/ardour/buffer.h
libs/ardour/ardour/buffer_set.h