1. 15 Sep, 2009 2 commits
  2. 14 Sep, 2009 4 commits
    • Alexandre Savard's avatar
    • Alexandre Savard's avatar
      [#2165] Fix several merge problems · 0c5a1dfb
      Alexandre Savard authored
      0c5a1dfb
    • Alexandre Savard's avatar
      Merge branch 'master' into conference · a5bde305
      Alexandre Savard authored
      Conflicts:
      	sflphone-client-gnome/pixmaps/Makefile.am
      	sflphone-client-gnome/src/Makefile.am
      	sflphone-client-gnome/src/actions.h
      	sflphone-client-gnome/src/contacts/calltree.c
      	sflphone-client-gnome/src/dbus/callmanager-introspec.xml
      	sflphone-client-gnome/src/dbus/dbus.c
      	sflphone-common/src/Makefile.am
      	sflphone-common/src/audio/Makefile.am
      	sflphone-common/src/audio/alsalayer.cpp
      	sflphone-common/src/audio/audiolayer.h
      	sflphone-common/src/audio/audiortp.cpp
      	sflphone-common/src/audio/audiortp.h
      	sflphone-common/src/audio/codecDescriptor.h
      	sflphone-common/src/audio/pulselayer.cpp
      	sflphone-common/src/audio/pulselayer.h
      	sflphone-common/src/dbus/callmanager.h
      	sflphone-common/src/iaxvoiplink.cpp
      	sflphone-common/src/iaxvoiplink.h
      	sflphone-common/src/managerimpl.cpp
      	sflphone-common/src/managerimpl.h
      	sflphone-common/src/sdp.cpp
      	sflphone-common/src/sipcall.cpp
      	sflphone-common/src/sipcall.h
      	sflphone-common/src/sipvoiplink.cpp
      	sflphone-common/src/sipvoiplink.h
      	sflphone-common/test/Makefile.am
      a5bde305
    • Alexandre Savard's avatar
      [#2165] Fix IAX · 2280923b
      Alexandre Savard authored
      2280923b
  3. 11 Sep, 2009 3 commits
  4. 10 Sep, 2009 4 commits
  5. 09 Sep, 2009 2 commits
  6. 08 Sep, 2009 8 commits
  7. 07 Sep, 2009 5 commits
  8. 04 Sep, 2009 8 commits
  9. 03 Sep, 2009 4 commits