[Libreoffice-commits] online.git: 2 commits - loolwsd/.gitignore loolwsd/Makefile.am

[Ashod Nakashian]

 loolwsd/.gitignore  |    2 +-
 loolwsd/Makefile.am |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit df47ff1b2f475ea430cd214ecf23372f3d750102
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Thu Apr 14 23:11:39 2016 -0400

    loolwsd: .gitignore updated
    
    Change-Id: Ica74b3f6f2fd9e3f9d75f41f2f780010b9b9bc55
    Reviewed-on: https://gerrit.libreoffice.org/24109
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/.gitignore b/loolwsd/.gitignore
index ca7b0e8..9190e91 100644
--- a/loolwsd/.gitignore
+++ b/loolwsd/.gitignore
@@ -45,4 +45,4 @@ loolwsd
 loolforkit
 loolmount
 loolmap
-loolmount
+looltool
commit cf85f51850fbb87c4bb7f7a7493cd4021986b9e5
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Thu Apr 14 23:09:46 2016 -0400

    loolwsd: tabs -> spaces
    
    Change-Id: I581346970321446378ff135e0227e06a2092b39f
    Reviewed-on: https://gerrit.libreoffice.org/24108
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index b11426b..a81842b 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -28,7 +28,7 @@ AM_CTAGSFLAGS = $(AM_ETAGSFLAGS)
 
 shared_sources = ChildProcessSession.cpp \
                  IoUtil.cpp \
-				 Log.cpp \
+                 Log.cpp \
                  LOOLProtocol.cpp \
                  LOOLSession.cpp \
                  MessageQueue.cpp \
@@ -84,7 +84,7 @@ noinst_HEADERS = Admin.hpp \
                  FileServer.hpp \
                  IoUtil.hpp \
                  LoadTest.hpp \
-				 Log.hpp \
+                 Log.hpp \
                  LOKitHelper.hpp \
                  LOOLKit.hpp \
                  LOOLProtocol.hpp \