Commit 9c27daf4 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Fix bug in merge and in Makefile.am

parent ca80f2ac
include ../../globals.mak include ../../globals.mak
SUBDIRS=audiorecorder SUBDIRS=audiorecorder test
noinst_LTLIBRARIES = libplugin.la noinst_LTLIBRARIES = libplugin.la
SUBDIRS=test
libplugin_la_SOURCES = \ libplugin_la_SOURCES = \
pluginmanager.cpp \ pluginmanager.cpp \
librarymanager.cpp librarymanager.cpp
......
...@@ -947,10 +947,6 @@ SIPVoIPLink::SIPCallServerFailure(SIPCall *call) ...@@ -947,10 +947,6 @@ SIPVoIPLink::SIPCallServerFailure(SIPCall *call)
//} //}
} }
void
SIPVoIPLink::SIPCallClosed(SIPCall *call)
{
void void
SIPVoIPLink::SIPCallClosed(SIPCall *call) SIPVoIPLink::SIPCallClosed(SIPCall *call)
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment