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 16 years ago by Yun Liu
--- a/libs/dbus-c++/missing
+++ b/libs/dbus-c++/missing
--- a/libs/dbus-c++/src/Makefile.am
+++ b/libs/dbus-c++/src/Makefile.am
--- a/libs/dbus-c++/src/connection.cpp
+++ b/libs/dbus-c++/src/connection.cpp
--- a/libs/dbus-c++/src/connection_p.h
+++ b/libs/dbus-c++/src/connection_p.h
--- a/libs/dbus-c++/src/debug.cpp
+++ b/libs/dbus-c++/src/debug.cpp
--- a/libs/dbus-c++/src/dispatcher.cpp
+++ b/libs/dbus-c++/src/dispatcher.cpp
--- a/libs/dbus-c++/src/dispatcher_p.h
+++ b/libs/dbus-c++/src/dispatcher_p.h
--- a/libs/dbus-c++/src/error.cpp
+++ b/libs/dbus-c++/src/error.cpp
--- a/libs/dbus-c++/src/eventloop-integration.cpp
+++ b/libs/dbus-c++/src/eventloop-integration.cpp
--- a/libs/dbus-c++/src/eventloop.cpp
+++ b/libs/dbus-c++/src/eventloop.cpp
--- a/libs/dbus-c++/src/glib-integration.cpp
+++ b/libs/dbus-c++/src/glib-integration.cpp
--- a/libs/dbus-c++/src/interface.cpp
+++ b/libs/dbus-c++/src/interface.cpp
--- a/libs/dbus-c++/src/internalerror.h
+++ b/libs/dbus-c++/src/internalerror.h
--- a/libs/dbus-c++/src/introspection.cpp
+++ b/libs/dbus-c++/src/introspection.cpp
--- a/libs/dbus-c++/src/message.cpp
+++ b/libs/dbus-c++/src/message.cpp
--- a/libs/dbus-c++/src/message_p.h
+++ b/libs/dbus-c++/src/message_p.h
--- a/libs/dbus-c++/src/object.cpp
+++ b/libs/dbus-c++/src/object.cpp
--- a/libs/dbus-c++/src/pendingcall.cpp
+++ b/libs/dbus-c++/src/pendingcall.cpp
--- a/libs/dbus-c++/src/pendingcall_p.h
+++ b/libs/dbus-c++/src/pendingcall_p.h
--- a/libs/dbus-c++/src/property.cpp
+++ b/libs/dbus-c++/src/property.cpp