merge with master and fix 2 conflicts
[ardour.git] / libs / libltc /
2012-12-14 Paul Davismerge robin gareus' libltc into ardour source tree...