Merge branch 'master' into recording

Conflicts: src/audio/audiortp.cpp src/sipvoiplink.cpp

Merge branch 'master' into recording
Conflicts: src/audio/audiortp.cpp src/sipvoiplink.cpp
2ee8dbb5 · alexandresavard · 007abd23 · 9c27daf4 · 007abd23 · 007abd23
Commit 2ee8dbb5 authored Feb 05, 2009 by alexandresavard
--- a/www/images/icons/README
+++ b/www/images/icons/README
--- a/www/images/icons/callouts/1.png
+++ b/www/images/icons/callouts/1.png
--- a/www/images/icons/callouts/10.png
+++ b/www/images/icons/callouts/10.png
--- a/www/images/icons/callouts/11.png
+++ b/www/images/icons/callouts/11.png
--- a/www/images/icons/callouts/12.png
+++ b/www/images/icons/callouts/12.png
--- a/www/images/icons/callouts/13.png
+++ b/www/images/icons/callouts/13.png
--- a/www/images/icons/callouts/14.png
+++ b/www/images/icons/callouts/14.png
--- a/www/images/icons/callouts/15.png
+++ b/www/images/icons/callouts/15.png
--- a/www/images/icons/callouts/2.png
+++ b/www/images/icons/callouts/2.png
--- a/www/images/icons/callouts/3.png
+++ b/www/images/icons/callouts/3.png
--- a/www/images/icons/callouts/4.png
+++ b/www/images/icons/callouts/4.png
--- a/www/images/icons/callouts/5.png
+++ b/www/images/icons/callouts/5.png
--- a/www/images/icons/callouts/6.png
+++ b/www/images/icons/callouts/6.png
--- a/www/images/icons/callouts/7.png
+++ b/www/images/icons/callouts/7.png
--- a/www/images/icons/callouts/8.png
+++ b/www/images/icons/callouts/8.png
--- a/www/images/icons/callouts/9.png
+++ b/www/images/icons/callouts/9.png
--- a/www/images/icons/caution.png
+++ b/www/images/icons/caution.png
--- a/www/images/icons/example.png
+++ b/www/images/icons/example.png
--- a/www/images/icons/home.png
+++ b/www/images/icons/home.png
--- a/www/images/icons/important.png
+++ b/www/images/icons/important.png