-
- Downloads
Project 'savoirfairelinux/ring-daemon' was moved to 'savoirfairelinux/jami-daemon'. Please update any links and bookmarks that may still have the old path.
Merge branch 'master' of...
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
Showing
- daemon/README 0 additions, 2 deletionsdaemon/README
- daemon/README.gentoo 0 additions, 23 deletionsdaemon/README.gentoo
- daemon/configure.ac 10 additions, 47 deletionsdaemon/configure.ac
- daemon/globals.mak 2 additions, 14 deletionsdaemon/globals.mak
- daemon/libs/Makefile.am 1 addition, 1 deletiondaemon/libs/Makefile.am
- daemon/libs/pjproject/config.guess 728 additions, 515 deletionsdaemon/libs/pjproject/config.guess
- daemon/libs/pjproject/config.sub 300 additions, 99 deletionsdaemon/libs/pjproject/config.sub
- daemon/libs/utilspp/Makefile.am 0 additions, 10 deletionsdaemon/libs/utilspp/Makefile.am
- daemon/libs/utilspp/null_type.hpp 0 additions, 32 deletionsdaemon/libs/utilspp/null_type.hpp
- daemon/libs/utilspp/singleton.hpp 0 additions, 2 deletionsdaemon/libs/utilspp/singleton.hpp
- daemon/libs/utilspp/singleton/Makefile.am 0 additions, 6 deletionsdaemon/libs/utilspp/singleton/Makefile.am
- daemon/libs/utilspp/singleton/creation_using_new.hpp 0 additions, 42 deletionsdaemon/libs/utilspp/singleton/creation_using_new.hpp
- daemon/libs/utilspp/singleton/creation_using_new.inl 0 additions, 42 deletionsdaemon/libs/utilspp/singleton/creation_using_new.inl
- daemon/libs/utilspp/singleton/lifetime_default.hpp 0 additions, 40 deletionsdaemon/libs/utilspp/singleton/lifetime_default.hpp
- daemon/libs/utilspp/singleton/lifetime_default.inl 0 additions, 44 deletionsdaemon/libs/utilspp/singleton/lifetime_default.inl
- daemon/libs/utilspp/singleton/singleton_holder.hpp 0 additions, 63 deletionsdaemon/libs/utilspp/singleton/singleton_holder.hpp
- daemon/libs/utilspp/singleton/singleton_holder.inl 0 additions, 127 deletionsdaemon/libs/utilspp/singleton/singleton_holder.inl
- daemon/libs/utilspp/threading_single.hpp 0 additions, 52 deletionsdaemon/libs/utilspp/threading_single.hpp
- daemon/libs/utilspp/threading_single.inl 0 additions, 50 deletionsdaemon/libs/utilspp/threading_single.inl
- daemon/src/Makefile.am 6 additions, 2 deletionsdaemon/src/Makefile.am
Loading
Please register or sign in to comment