[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - .gitignore Makefile.am

Andras Timar andras.timar at collabora.com
Mon Jun 5 14:33:43 UTC 2017


 .gitignore  |    1 -
 Makefile.am |    9 ---------
 2 files changed, 10 deletions(-)

New commits:
commit 5e8423060ae07303aeae7de6d836a73727502fe5
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Jun 1 16:47:43 2017 +0200

    loolnb was killed earlier
    
    Change-Id: Ie4b1f3c890c59a8b9204af5a25842c74929ecad8
    Reviewed-on: https://gerrit.libreoffice.org/38315
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/.gitignore b/.gitignore
index 1af727aa..1fe9d685 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,7 +59,6 @@ loolforkit-nocaps
 loadtest
 unittest
 loolwsd_fuzzer
-loolnb
 clientnb
 
 # make tags
diff --git a/Makefile.am b/Makefile.am
index cff7e2ff..4d2e10e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,15 +106,6 @@ loolwsd_fuzzer_SOURCES = $(loolwsd_sources) \
                          $(shared_sources) \
                          kit/DummyLibreOfficeKit.cpp
 
-loolnb_SOURCES = net/loolnb.cpp \
-                 net/Socket.cpp \
-                 common/Log.cpp \
-                 common/SigUtil.cpp \
-                 common/Util.cpp
-if ENABLE_SSL
-loolnb_SOURCES += net/Ssl.cpp
-endif
-
 clientnb_SOURCES = net/clientnb.cpp \
                    common/Log.cpp \
                    common/Util.cpp


More information about the Libreoffice-commits mailing list