Merge branch 'master' of git+ssh://sflphone_org@sflphone.org/git/sflphone
Conflicts: sflphone-gtk/src/configwindow.c
This diff is collapsed.
No preview for this file type
src/audio/codec_gsm.so
0 → 100755
File added
src/audio/codec_ilbc.so
0 → 100755
File added
No preview for this file type