merge with master and fix 4 conflicts by hand
[ardour.git] / libs / timecode /
drwxr-xr-x   ..
drwxr-xr-x - MSVCtimecode
drwxr-xr-x - src
drwxr-xr-x - timecode
-rw-r--r-- 603 wscript