projects / ardour.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e466ce4 8ea695c)
Merge branch 'windows' into windows+cc
authorJohn Emmas <johne53@tiscali.co.uk>
Tue, 15 Oct 2013 16:38:08 +0000 (17:38 +0100)
committerJohn Emmas <johne53@tiscali.co.uk>
Tue, 15 Oct 2013 16:38:08 +0000 (17:38 +0100)
commit97c68cc2b1f302521244e139a8a49019702038e7
tree04171941f47a9d9bf3d8a92260e2a1af2752c71ctree | snapshot
parente466ce40ad1ba591543020cb7c0aa15dbebef81ecommit | diff
parent8ea695c00ab0bdbc6fbb29b33fac6e3dbfcbe9f1commit | diff
Merge branch 'windows' into windows+cc

Conflicts (hopefully resolved):
libs/pbd/stacktrace.cc
libs/pbd/stacktrace.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.