Skip to content
Snippets Groups Projects
  1. Apr 05, 2010
  2. Apr 01, 2010
  3. Mar 30, 2010
  4. Mar 29, 2010
    • 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
  5. Mar 25, 2010
  6. Mar 24, 2010
  7. Mar 23, 2010
  8. Mar 22, 2010
Loading