projects / ardour.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a436fd 6a18103)
Merge branch 'master' into windows
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 1 Aug 2013 14:44:58 +0000 (10:44 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 1 Aug 2013 14:44:58 +0000 (10:44 -0400)
1  2 
wscript patch | diff1 | diff2 | blob | history

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