diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-23 08:47:57 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-23 08:47:57 -0400 |
commit | d135c4dc3a307d0be606f3afbbc8fd8c3ec56438 (patch) | |
tree | dbedf6ddfe1c1b6557a885ad3b87455ba2213a12 /gtk2_ardour/ardour3_ui_default.conf | |
parent | fb313fb1741a04f270fff3703967df572ac4fc45 (diff) | |
parent | 75271a17d8d4ed0003c4627e80a28feb68f5d9c9 (diff) |
fix merge conflicts with master
Diffstat (limited to 'gtk2_ardour/ardour3_ui_default.conf')
0 files changed, 0 insertions, 0 deletions