Merge branch 'master' of ssh://repo.or.cz/srv/git/sgc2
commit3a27b75bd341643d3b193b490a1d73d162b5403a
authorRob van Son <R.J.J.H.vanSon@gmail.com>
Tue, 10 Nov 2015 19:47:41 +0000 (10 20:47 +0100)
committerRob van Son <R.J.J.H.vanSon@gmail.com>
Tue, 10 Nov 2015 19:47:41 +0000 (10 20:47 +0100)
treee0866dca63af2400069e375af5165031fcdba816
parenta6459fb928041c7e8ab748bedebcc79760262bd9
parentcc518ad9b050c6b89c80ec001eb0d318b1f27587
Merge branch 'master' of ssh://repo.or.cz/srv/git/sgc2
praat_module/adaptPraat.patch