-
Tristan Matthews authored
Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview Resolved Conflicts: daemon/configure.ac daemon/src/dbus/callmanager.cpp daemon/src/global.h gnome/src/Makefile.am gnome/src/actions.c gnome/src/config/accountconfigdialog.c gnome/src/config/audioconf.c gnome/src/config/preferencesdialog.c gnome/src/dbus/dbus.c gnome/tests/Makefile.am
a4312b03