diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-14 12:18:55 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-14 12:18:55 -0500 |
| commit | 06f2136c4fe1fbf028fc765f70cf72b262a3445f (patch) | |
| tree | 3541cb0537657bdd4a6cbdc602c190ee25a11d7e /libs/ardour/audiosource.cc | |
| parent | c98366c7c8a18a7987902dd418d876f2e1ee5372 (diff) | |
merge conflict resolution (text colors are no longer specified explicitly)
Diffstat (limited to 'libs/ardour/audiosource.cc')
0 files changed, 0 insertions, 0 deletions