projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6bcdf4f
91b027a
)
Merge branch 'master' into audioengine
author
Paul Davis
<paul@linuxaudiosystems.com>
Tue, 3 Sep 2013 21:41:49 +0000
(17:41 -0400)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Tue, 3 Sep 2013 21:41:49 +0000
(17:41 -0400)
1
2
libs/ardour/audio_diskstream.cc
patch
|
diff1
|
diff2
|
blob
|
history
libs/ardour/audio_track.cc
patch
|
diff1
|
diff2
|
blob
|
history
libs/ardour/lv2_plugin.cc
patch
|
diff1
|
diff2
|
blob
|
history
libs/surfaces/mackie/mackie_control_protocol.cc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libs/ardour/audio_diskstream.cc
Simple merge
diff --cc
libs/ardour/audio_track.cc
Simple merge
diff --cc
libs/ardour/lv2_plugin.cc
Simple merge
diff --cc
libs/surfaces/mackie/mackie_control_protocol.cc
Simple merge