diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-22 19:19:24 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:24 -0500 |
| commit | 9b9a7beb130d183fc08a57927a3eaf4441be6809 (patch) | |
| tree | 2857fa4cdf41c3949d262634fbff8af9ac6f95f0 /libs/ardour/globals.cc | |
| parent | ec65e351acea329de1d09b8ce518a023001dfdab (diff) | |
cleanup various merge conflict resolution errors/omissions
Diffstat (limited to 'libs/ardour/globals.cc')
0 files changed, 0 insertions, 0 deletions