-
ssh://manu@192.168.1.105/~manu/dev/sflphoneEmmanuel Milou authored
Conflicts: src/plug-in/plugininterface.h src/plug-in/test/pluginTest.cpp test/pluginmanagerTest.cpp
0953d8a9
Conflicts: src/plug-in/plugininterface.h src/plug-in/test/pluginTest.cpp test/pluginmanagerTest.cpp