From 80c83f4a578e1ec0c8b5e439687716e365937c9a Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@collabora.co.uk>
Date: Wed, 12 Nov 2014 05:59:39 +0100
Subject: Revert "Revert "wrong merge conflict resolution, vcldemo, icontest go
 to instdir""

This reverts commit b64caa8ad85d951c74e1c84096802997340c8e1b.
---
 Repository.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Repository.mk')

diff --git a/Repository.mk b/Repository.mk
index 3d3e35af673b..e62f6321b1e3 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)
-- 
cgit v1.2.3