Merge branch 'sip_dev' of ssh://yun@192.168.1.16/home-local/manu/dev/sfl/sflphone into yun-pjsip

08a9e830 · Yun Liu · af93f9f9 · c2c032f6 · 08a9e830 · 08a9e830
Commit 08a9e830 authored Oct 7, 2008 by Yun Liu
--- a/src/dbus/configurationmanager.cpp
+++ b/src/dbus/configurationmanager.cpp
--- a/src/dbus/configurationmanager.h
+++ b/src/dbus/configurationmanager.h
--- a/src/dbus/contactmanager-glue.h
+++ b/src/dbus/contactmanager-glue.h
--- a/src/dbus/contactmanager.cpp
+++ b/src/dbus/contactmanager.cpp
--- a/src/dbus/contactmanager.h
+++ b/src/dbus/contactmanager.h
--- a/src/dbus/instance-glue.h
+++ b/src/dbus/instance-glue.h
--- a/src/dbus/instance.cpp
+++ b/src/dbus/instance.cpp
--- a/src/dbus/instance.h
+++ b/src/dbus/instance.h
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
--- a/src/managerimpl.h
+++ b/src/managerimpl.h
--- a/src/sipvoiplink.cpp
+++ b/src/sipvoiplink.cpp
--- a/src/useragent.cpp
+++ b/src/useragent.cpp