Merge branch 'plug-in' of ssh://manu@192.168.1.105/~manu/dev/sflphone into plugins
Conflicts: src/plug-in/plugininterface.h src/plug-in/test/pluginTest.cpp test/pluginmanagerTest.cpp
Please register or sign in to comment
Conflicts: src/plug-in/plugininterface.h src/plug-in/test/pluginTest.cpp test/pluginmanagerTest.cpp