Merge branch 'master' of ssh://repo.or.cz/srv/git/sgc2
commit75b68366809c12b8cd8ea67805014d6cb64ef4c1
authorRob van Son <r.j.j.h.vanson@gmail.com>
Wed, 27 Jan 2016 14:49:44 +0000 (27 15:49 +0100)
committerRob van Son <r.j.j.h.vanson@gmail.com>
Wed, 27 Jan 2016 14:49:44 +0000 (27 15:49 +0100)
tree097f96121f9a8d39bf11ebca360fe645785a6521
parent664cdbd11476629bb55ec8a5357b20bd1da4cd01
parentb446e0080e3aa222a6973e972f500a9fd441bad4
Merge branch 'master' of ssh://repo.or.cz/srv/git/sgc2
praat_module/adaptPraat.patch