Skip to content
GitLab
Commit 9c27daf4 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Fix bug in merge and in Makefile.am

parent ca80f2ac
Hide whitespace changes
Inline Side-by-side
src/plug-in/Makefile.am
View file @ 9c27daf4
include ../../globals.mak
SUBDIRS=audiorecorder
SUBDIRS=audiorecorder test
noinst_LTLIBRARIES = libplugin.la
SUBDIRS=test
libplugin_la_SOURCES = \
pluginmanager.cpp \
librarymanager.cpp
......
src/sipvoiplink.cpp
View file @ 9c27daf4
......@@ -947,10 +947,6 @@ SIPVoIPLink::SIPCallServerFailure(SIPCall *call)
//}
}
void
SIPVoIPLink::SIPCallClosed(SIPCall *call)
{
void
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