1. 03 Apr, 2012 1 commit
    • 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
  2. 02 Apr, 2012 7 commits
  3. 30 Mar, 2012 7 commits
  4. 29 Mar, 2012 4 commits
  5. 28 Mar, 2012 5 commits
  6. 27 Mar, 2012 16 commits