]> Shamusworld >> Repos - ardour-manual-diverged/commitdiff
projects / ardour-manual-diverged / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79c80e1 6921f2a)
Merge branch 'master' of http://shamusworld.gotdns.org/git/ardour-manual
authorShamus Hammons <jlhamm@acm.org>
Thu, 12 Jan 2017 19:11:22 +0000 (13:11 -0600)
committerShamus Hammons <jlhamm@acm.org>
Thu, 12 Jan 2017 19:11:22 +0000 (13:11 -0600)
1  2 
master-doc.txt patch | diff1 | diff2 | blob | history

diff --cc master-doc.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.