Merge branch 'master' of ssh://repo.or.cz/srv/git/sgc2
commit308031af742fd3b09fa239f69994ac1220a5246b
authorRob van Son <r.j.j.h.vanson@gmail.com>
Thu, 11 Jun 2015 07:49:10 +0000 (11 09:49 +0200)
committerRob van Son <r.j.j.h.vanson@gmail.com>
Thu, 11 Jun 2015 07:49:10 +0000 (11 09:49 +0200)
tree0153a6f5279f37ccecd07ab3f4fcc8cd66e2bc88
parent759beec3152746949a03ec2fdd4b6967d2cbe546
parent408122b0b7ee4ee90b671ecccc251226b98fa494
Merge branch 'master' of ssh://repo.or.cz/srv/git/sgc2
Config.praat