]> Shamusworld >> Repos - ardour-manual-diverged/commitdiff
projects / ardour-manual-diverged / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcf9db4 9d9e498)
Merge branch 'master' of http://shamusworld.gotdns.org/git/ardour-manual
authorEd Ward <edwsaintesprit@hotmail.com>
Thu, 12 Jan 2017 19:32:56 +0000 (20:32 +0100)
committerEd Ward <edwsaintesprit@hotmail.com>
Thu, 12 Jan 2017 19:32:56 +0000 (20:32 +0100)
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.