Fix bug in merge and in Makefile.am

9c27daf4 · Emmanuel Milou · ca80f2ac · 9c27daf4 · 9c27daf4
Commit 9c27daf4 authored Feb 04, 2009 by Emmanuel Milou
--- a/src/plug-in/Makefile.am
+++ b/src/plug-in/Makefile.am
 include ../../globals.mak

-SUBDIRS=audiorecorder
+SUBDIRS=audiorecorder test

 noinst_LTLIBRARIES = libplugin.la

-SUBDIRS=test
-
 libplugin_la_SOURCES = \
 		pluginmanager.cpp \
 		librarymanager.cpp

--- a/src/sipvoiplink.cpp
+++ b/src/sipvoiplink.cpp
@@ -947,10 +947,6 @@ SIPVoIPLink::SIPCallServerFailure(SIPCall *call)
    //}
 }

-void
-SIPVoIPLink::SIPCallClosed(SIPCall *call) 
-{
-
 void
 SIPVoIPLink::SIPCallClosed(SIPCall *call) 
 {