Conflicts:
	sflphone-client-gnome/src/accountlist.c
	sflphone-client-gnome/src/actions.c
	sflphone-client-gnome/src/actions.h
	sflphone-client-gnome/src/callable_obj.c
	sflphone-client-gnome/src/callable_obj.h
	sflphone-client-gnome/src/codeclist.c
	sflphone-client-gnome/src/conference_obj.c
	sflphone-client-gnome/src/conference_obj.h
	sflphone-client-gnome/src/config/accountconfigdialog.c
	sflphone-client-gnome/src/config/accountlistconfigdialog.c
	sflphone-client-gnome/src/config/accountlistconfigdialog.h
	sflphone-client-gnome/src/config/addressbook-config.c
	sflphone-client-gnome/src/config/addressbook-config.h
	sflphone-client-gnome/src/config/assistant.c
	sflphone-client-gnome/src/config/audioconf.c
	sflphone-client-gnome/src/config/preferencesdialog.c
	sflphone-client-gnome/src/config/preferencesdialog.h
	sflphone-client-gnome/src/config/shortcuts-config.c
	sflphone-client-gnome/src/config/shortcuts-config.h
	sflphone-client-gnome/src/config/tlsadvanceddialog.c
	sflphone-client-gnome/src/contacts/addressbook.c
	sflphone-client-gnome/src/contacts/addressbook/eds.c
	sflphone-client-gnome/src/contacts/addressbook/eds.h
	sflphone-client-gnome/src/contacts/calllist.c
	sflphone-client-gnome/src/contacts/calltree.c
	sflphone-client-gnome/src/contacts/calltree.h
	sflphone-client-gnome/src/contacts/history.c
	sflphone-client-gnome/src/contacts/searchbar.c
	sflphone-client-gnome/src/dbus/dbus.c
	sflphone-client-gnome/src/dbus/dbus.h
	sflphone-client-gnome/src/eel-gconf-extensions.c
	sflphone-client-gnome/src/icons/icon_factory.c
	sflphone-client-gnome/src/icons/pixmap_data.h
	sflphone-client-gnome/src/main.c
	sflphone-client-gnome/src/mainwindow.c
	sflphone-client-gnome/src/mainwindow.h
	sflphone-client-gnome/src/sflnotify.c
	sflphone-client-gnome/src/sflnotify.h
	sflphone-client-gnome/src/sflphone_const.h
	sflphone-client-gnome/src/shortcuts.c
	sflphone-client-gnome/src/shortcuts.h
	sflphone-client-gnome/src/statusicon.c
	sflphone-client-gnome/src/toolbar.c
	sflphone-client-gnome/src/uimanager.c
	sflphone-client-gnome/src/widget/gtkscrollbook.c
	sflphone-client-gnome/src/widget/minidialog.c
	sflphone-common/libs/dbus-c++/src/message.cpp
	sflphone-common/libs/dbus-c++/src/types.cpp
	sflphone-common/src/account.cpp
	sflphone-common/src/audio/alsa/alsalayer.cpp
	sflphone-common/src/audio/audiorecorder.cpp
	sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
	sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
	sflphone-common/src/audio/dcblocker.cpp
	sflphone-common/src/audio/delaydetection.cpp
	sflphone-common/src/audio/echocancel.cpp
	sflphone-common/src/audio/jitterbuf.cpp
	sflphone-common/src/audio/mainbuffer.cpp
	sflphone-common/src/audio/pulseaudio/audiostream.cpp
	sflphone-common/src/audio/pulseaudio/pulselayer.cpp
	sflphone-common/src/audio/speexechocancel.cpp
	sflphone-common/src/call.cpp
	sflphone-common/src/conference.cpp
	sflphone-common/src/dbus/callmanager.h
	sflphone-common/src/dbus/configurationmanager.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/managerimpl.h
	sflphone-common/src/sip/sipaccount.cpp
	sflphone-common/src/sip/sipvoiplink.cpp
	sflphone-common/src/sip/sipvoiplink.h
	sflphone-common/test/audiolayertest.cpp
	sflphone-common/test/configurationtest.cpp
	sflphone-common/test/historytest.cpp
	sflphone-common/test/main.cpp