diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-02-07 19:00:44 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-02-07 19:00:44 -0500 |
commit | 2a7ed69c28c5c4606ff13b3605b9bc9c3eba607d (patch) | |
tree | 8bc1cbb9df7bab6bafac672d11ce6e63f3a8542d /gtk2_ardour/lineset.h | |
parent | 89d5be353addf41e0d6cdf5c70cdc988a0c3d19a (diff) | |
parent | d47fe167e3c1dc44e4114227b0e8b83b40b35169 (diff) |
merge with master, with minor conflict fixes
Diffstat (limited to 'gtk2_ardour/lineset.h')
0 files changed, 0 insertions, 0 deletions