diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-04-20 15:10:41 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-04-20 15:10:41 -0400 |
| commit | ced4378d0914bcfb926267772c45d1d23f3bed38 (patch) | |
| tree | e31875d77bf2742cd8684b3a9f02d1b2d7c98967 /libs/ardour/coreaudiosource.cc | |
| parent | 6dea7ebfb0bb66fa58b353467724a90805fb7a47 (diff) | |
| parent | 00f06ca9e91470f92d8f6d5ef83cbae069904f51 (diff) | |
Merge branch 'master' into saveas
Conflicts:
gtk2_ardour/ardour.menus.in
libs/ardour/session_state.cc
Diffstat (limited to 'libs/ardour/coreaudiosource.cc')
0 files changed, 0 insertions, 0 deletions