• Tristan Matthews's avatar
    Merge branch 'master' of... · d47564e8
    Tristan Matthews authored
    Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview
    
    Resolved Conflicts:
    	daemon/src/account.cpp
    	daemon/src/audio/audiortp/audio_rtp_session.h
    	daemon/src/sip/sipvoiplink.cpp
    	gnome/src/accountlist.h
    	gnome/src/actions.c
    	gnome/src/codeclist.c
    	gnome/src/codeclist.h
    	gnome/src/config/accountconfigdialog.c
    	gnome/src/config/audioconf.c
    	gnome/src/dbus/dbus.c
    	gnome/tests/Makefile.am
    d47564e8
Name
Last commit
Last update
..
Makefile.am Loading commit data...
check_config.c Loading commit data...
check_contacts.c Loading commit data...
check_dbus.c Loading commit data...
check_global.c Loading commit data...