1. 16 Apr, 2010 2 commits
  2. 15 Apr, 2010 1 commit
  3. 14 Apr, 2010 2 commits
  4. 09 Apr, 2010 1 commit
  5. 06 Apr, 2010 1 commit
  6. 05 Apr, 2010 6 commits
  7. 01 Apr, 2010 1 commit
  8. 30 Mar, 2010 3 commits
  9. 29 Mar, 2010 1 commit
    • Emmanuel Lepage Vallee's avatar
      Merge branch 'master' into qt-client · 49ec6ae1
      Emmanuel Lepage Vallee authored
      Conflicts:
      	sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp
      	sflphone-client-kde/src/conf/dlgaccounts.cpp
      	sflphone-client-kde/src/conf/dlgaccounts.h
      	sflphone-client-kde/src/conf/dlgaccountsbase.ui
      	sflphone-client-kde/src/main.cpp
      	sflphone-common/libs/pjproject/build/os-auto.mak
      	sflphone-common/libs/pjproject/config.guess
      	sflphone-common/libs/pjproject/config.sub
      	sflphone-common/libs/pjproject/pjlib/build/os-auto.mak
      	sflphone-common/src/dbus/configurationmanager-introspec.xml
      	sflphone-common/src/managerimpl.cpp
      49ec6ae1
  10. 25 Mar, 2010 9 commits
  11. 24 Mar, 2010 13 commits