-
ssh://manu@192.168.1.105/~/dev/sflphoneEmmanuel Milou authored
Conflicts: configure.ac src/plug-in/pluginmanager.cpp src/plug-in/pluginmanager.h test/pluginmanagerTest.cpp
4a1abced
Conflicts: configure.ac src/plug-in/pluginmanager.cpp src/plug-in/pluginmanager.h test/pluginmanagerTest.cpp