1. 24 Apr, 2012 1 commit
    • Tristan Matthews's avatar
      Merge branch 'master' of... · fa4617b2
      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.h
      	daemon/src/audio/codecs/celtcodec.cpp
      	daemon/src/audio/pulseaudio/pulselayer.cpp
      	daemon/src/config/sfl_config.cpp
      	daemon/src/config/yamlemitter.cpp
      	daemon/src/config/yamlemitter.h
      	daemon/src/config/yamlparser.cpp
      	daemon/src/main.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/sipvoiplink.cpp
      	daemon/test/audiolayertest.h
      	daemon/test/gaincontroltest.cpp
      	daemon/test/sdptest.cpp
      	gnome/configure.ac
      	gnome/src/dbus/dbus.c
      fa4617b2
  2. 23 Apr, 2012 4 commits
  3. 22 Apr, 2012 4 commits
  4. 21 Apr, 2012 1 commit
  5. 20 Apr, 2012 5 commits
  6. 19 Apr, 2012 17 commits
  7. 18 Apr, 2012 8 commits