diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-10-15 17:38:08 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-15 17:38:08 +0100 |
| commit | 97c68cc2b1f302521244e139a8a49019702038e7 (patch) | |
| tree | 04171941f47a9d9bf3d8a92260e2a1af2752c71c /gtk2_ardour/video_server_dialog.cc | |
| parent | e466ce40ad1ba591543020cb7c0aa15dbebef81e (diff) | |
| parent | 8ea695c00ab0bdbc6fbb29b33fac6e3dbfcbe9f1 (diff) | |
Merge branch 'windows' into windows+cc
Conflicts (hopefully resolved):
libs/pbd/stacktrace.cc
Diffstat (limited to 'gtk2_ardour/video_server_dialog.cc')
0 files changed, 0 insertions, 0 deletions