Merge branch 'master' into recording
Conflicts: src/audio/audiortp.cpp src/sipvoiplink.cpp
doc/About.txt
deleted
100644 → 0
doc/Build.txt
deleted
100644 → 0
doc/Debug.txt
deleted
100644 → 0
doc/Dependencies.txt
deleted
100644 → 0
doc/Downloads.txt
deleted
100644 → 0
doc/Features.txt
deleted
100644 → 0
doc/Git_Access.txt
deleted
100644 → 0
doc/Goals.txt
deleted
100644 → 0
doc/IRC.txt
deleted
100644 → 0
doc/MailingLists.txt
deleted
100644 → 0
doc/News.txt
deleted
100644 → 0
doc/SFLvideo.txt
deleted
100644 → 0
doc/Screenshots.txt
deleted
100644 → 0
doc/asciidoc.conf
deleted
100644 → 0
doc/images/devel.png
deleted
100644 → 0
6 KB
doc/images/fetch.png
deleted
100644 → 0
3.16 KB
doc/images/home.png
deleted
100644 → 0
1.51 KB
doc/images/info.png
deleted
100644 → 0
5.56 KB