[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/AllLangResTarget_vcl.mk vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_svp.mk vcl/Module_vcl.mk vcl/Package_inc.mk vcl/Package_osx.mk vcl/WinResTarget_vcl.mk

[Libreoffice Gerrit user]

 vcl/AllLangResTarget_vcl.mk     |    1 -
 vcl/Library_desktop_detector.mk |    1 +
 vcl/Library_vcl.mk              |    3 ++-
 vcl/Library_vclplug_gen.mk      |    3 ++-
 vcl/Library_vclplug_kde.mk      |    1 +
 vcl/Library_vclplug_kde4.mk     |    1 +
 vcl/Library_vclplug_svp.mk      |    1 +
 vcl/Module_vcl.mk               |    1 -
 vcl/Package_inc.mk              |    1 +
 vcl/Package_osx.mk              |    3 ++-
 vcl/WinResTarget_vcl.mk         |    2 ++
 11 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit e1ee6c6b6fef3293025c524f7f4fc29cfd171113
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Fri Sep 28 18:18:47 2018 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Fri Sep 28 18:18:47 2018 +0000

    Minor cleanup according to vim modeline

diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index 467c7a2e3c96..5b37d3ec4fa7 100644
--- a/vcl/AllLangResTarget_vcl.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -47,5 +47,4 @@ $(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
     vcl/source/src/units.src \
 ))
 
-
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 1afacb7906a3..515e9eceadb9 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -85,4 +85,5 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
     pthread \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 23c98b7b957f..4cddfd46bc6d 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -57,7 +57,7 @@ endif
 ifeq ($(GUIBASE),unx)
 $(eval $(call gb_Library_set_include,vcl,\
     $$(INCLUDE) \
-     $$(FREETYPE_CFLAGS) \
+    $$(FREETYPE_CFLAGS) \
 ))
 endif
 
@@ -538,4 +538,5 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
     $(gb_STDLIBS) \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 0fa77f09a430..da16fe602977 100755
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -121,7 +121,7 @@ $(eval $(call gb_Library_add_defs,vclplug_gen,\
 ))
 
 
-## handle RandR 
+## handle RandR
 ifeq ($(ENABLE_RANDR),TRUE)
 $(eval $(call gb_Library_add_defs,vclplug_gen,\
     -DUSE_RANDR \
@@ -203,4 +203,5 @@ $(eval $(call gb_Library_add_libs,vclplug_gen, \
     -lXinerama -lXrandr \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 0a44cc3ba3c0..9c69bfc7e4c8 100755
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -91,4 +91,5 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
     pthread \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 0a57e5567dcb..1d41c11b7743 100755
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -97,4 +97,5 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
     pthread \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index d9c2407fe7c5..47a07c2221fc 100755
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -97,4 +97,5 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
     pthread \
 ))
 endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 6272197391bb..ceeb011373d5 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -21,7 +21,6 @@
 
 
 
-
 $(eval $(call gb_Module_Module,vcl))
 
 $(eval $(call gb_Module_add_targets,vcl,\
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index 85f3f39dba79..c064f7a5b8ca 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -162,3 +162,4 @@ $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/window.hxx,vcl/window.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wpropset.hxx,vcl/wpropset.hxx))
 $(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wrkwin.hxx,vcl/wrkwin.hxx))
 
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Package_osx.mk b/vcl/Package_osx.mk
index 8c7d11acd879..4bc0db6d85fa 100644
--- a/vcl/Package_osx.mk
+++ b/vcl/Package_osx.mk
@@ -25,8 +25,9 @@
 $(eval $(call gb_Package_Package,vcl_zip,))
 $(eval $(call gb_Package_add_file,vcl_zip,bin/osxres.zip,$(WORKDIR)/Misc/osxres.zip))
 
-/$(WORKDIR)/Misc/osxres.zip: $(SRCDIR)/vcl/aqua/source/res/MainMenu.nib/*.nib $(SRCDIR)/vcl/aqua/source/res/cursors/*.png 
+/$(WORKDIR)/Misc/osxres.zip: $(SRCDIR)/vcl/aqua/source/res/MainMenu.nib/*.nib $(SRCDIR)/vcl/aqua/source/res/cursors/*.png
     cd $(SRCDIR)/vcl/aqua/source/res ; \
     mkdir -p $(dir $@) ; \
     zip $@ MainMenu.nib/*.nib cursors/*.png
 
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
index f0e7dda5b77f..3f0e4bfcfa21 100755
--- a/vcl/WinResTarget_vcl.mk
+++ b/vcl/WinResTarget_vcl.mk
@@ -211,3 +211,5 @@ $(eval $(call gb_WinResTarget_set_include,vcl/src,\
 ))
 
 endif
+
+# vim: set noet sw=4 ts=4: