projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5cf1f7f
f5191e6
)
Merge branch 'master' into windows
author
Paul Davis
<paul@linuxaudiosystems.com>
Sat, 14 Sep 2013 20:21:32 +0000
(16:21 -0400)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Sat, 14 Sep 2013 20:21:32 +0000
(16:21 -0400)
1
2
libs/ardour/session_state.cc
patch
|
diff1
|
diff2
|
blob
|
history
wscript
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
libs/ardour/session_state.cc
Simple merge
diff --cc
wscript
Simple merge