diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-07-01 09:46:18 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-07-01 09:46:18 -0400 |
| commit | 23e7cf10191270d70357ccf0ed9294f020c7b7ab (patch) | |
| tree | ddc1fc4d1914fe3de3de79c194c5dd859915bd2a /libs/ardour/diskstream.cc | |
| parent | 4244ea65460b865f946551aace9b74191b26be4b (diff) | |
| parent | b660bc8ae92d19aedf0165815432b77a0c6170c4 (diff) | |
merge with master.
Manually resolved conflicts in import.cc and session.cc
Diffstat (limited to 'libs/ardour/diskstream.cc')
| -rw-r--r-- | libs/ardour/diskstream.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index aacb0ce1c9..0e05ffabf4 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -744,4 +744,3 @@ Diskstream::disengage_record_enable () { g_atomic_int_set (&_record_enabled, 0); } - |