-
Tristan Matthews authored
Resolved Conflicts: daemon/src/Makefile.am daemon/src/account.cpp daemon/src/account.h daemon/src/audio/audiortp/audio_rtp_session.h daemon/src/audio/codecs/audiocodec.cpp daemon/src/audio/codecs/audiocodecfactory.cpp daemon/src/audio/pulseaudio/pulselayer.cpp daemon/src/audio/pulseaudio/pulselayer.h daemon/src/call.cpp daemon/src/call.h daemon/src/config/yamlemitter.cpp daemon/src/config/yamlemitter.h daemon/src/config/yamlparser.cpp daemon/src/config/yamlparser.h daemon/src/dbus/callmanager.h daemon/src/dbus/configurationmanager.cpp daemon/src/dbus/configurationmanager.h daemon/src/main.cpp daemon/src/managerimpl.cpp daemon/src/preferences.cpp daemon/src/preferences.h daemon/src/sip/sdp.cpp daemon/src/sip/sdp.h daemon/src/sip/sipaccount.cpp daemon/src/sip/sipcall.cpp daemon/src/sip/sipcall.h daemon/src/sip/sipvoiplink.cpp daemon/test/sdptest.cpp gnome/src/actions.c gnome/src/callable_obj.c gnome/src/codeclist.c gnome/src/config/accountconfigdialog.c gnome/src/config/accountlistconfigdialog.c gnome/src/config/audioconf.c gnome/src/config/preferencesdialog.c gnome/src/config/shortcuts-config.c gnome/src/config/tlsadvanceddialog.c gnome/src/contacts/calltree.c gnome/src/contacts/searchbar.c gnome/src/dbus/dbus.c gnome/src/eel-gconf-extensions.c gnome/src/icons/icon_factory.c gnome/src/imwindow.c gnome/src/main.c gnome/src/mainwindow.c gnome/src/sflnotify.c gnome/src/shortcuts.c gnome/src/sliders.c gnome/src/statusicon.c gnome/src/uimanager.c gnome/src/widget/gtkscrollbook.c
6dc6f347