Repository.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 726e1a49bd40d98ffcfba760a08c503b096c79bd
Author: Markus Mohrhard <markus.mohrh...@collabora.co.uk>
Date: Mon Nov 10 15:34:10 2014 +0100
wrong merge conflict resolution, vcldemo, icontest go to instdir
Change-Id: Iefcca922fc824877c49a11cd68023d57eff22d2f
diff --git a/Repository.mk b/Repository.mk
index 3d3e35a..e62f632 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -68,9 +68,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
svpclient \
pixelctl ) \
$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \
- $(if $(filter LINUX MACOSX WNT,$(OS)),icontest \
- outdevgrind) \
- vcldemo \
tiledrendering \
$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \
))
@@ -150,6 +147,9 @@ $(eval $(call
gb_Helper_register_executables_for_install,OOO,ooo, \
$(if $(filter WNT,$(OS)), \
senddoc \
) \
+ $(if $(filter LINUX MACOSX WNT,$(OS)),icontest \
+ outdevgrind) \
+ vcldemo \
))
ifeq ($(OS),WNT)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
