projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
38ff5bb
5f0492d
)
Merge branch 'windows+cc' into cairocanvas
author
John Emmas
<johne53@tiscali.co.uk>
Mon, 13 Jan 2014 15:05:30 +0000
(15:05 +0000)
committer
John Emmas
<johne53@tiscali.co.uk>
Mon, 13 Jan 2014 15:05:30 +0000
(15:05 +0000)
1
2
libs/audiographer/audiographer/debuggable.h
patch
|
diff1
|
diff2
|
blob
|
history
libs/audiographer/audiographer/general/silence_trimmer.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libs/audiographer/audiographer/debuggable.h
Simple merge
diff --cc
libs/audiographer/audiographer/general/silence_trimmer.h
Simple merge