diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-10 04:30:31 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-10 07:59:58 +0100 |
| commit | 6efec7dca078dd92137a69886ca7f2bb8497df86 (patch) | |
| tree | 52faf5e5432b728482a0321576d3ada7a9df915b /Repository.mk | |
| parent | 5d048e11e701aa35d1d466a1e3795bb4bae86163 (diff) | |
fix bad merge conflict resolution
Change-Id: I788d57a5645c00f6bdb66cc14c7fa748bc8b02f2
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Repository.mk b/Repository.mk index 15bc3c985f1d..3d3e35af673b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -68,7 +68,8 @@ $(eval $(call gb_Helper_register_executables,NONE, \ svpclient \ pixelctl ) \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), tilebench) \ - $(if $(filter LINUX MACOSX WNT,$(OS)),icontest) \ + $(if $(filter LINUX MACOSX WNT,$(OS)),icontest \ + outdevgrind) \ vcldemo \ tiledrendering \ $(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \ @@ -146,10 +147,6 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ $(if $(filter unx-TRUE,$(GUIBASE)-$(ENABLE_TDE)),tdefilepicker) \ $(if $(filter WNT,$(OS)),,uri-encode) \ ui-previewer \ - $(if $(filter LINUX MACOSX WNT,$(OS)), \ - icontest \ - outdevgrind) \ - vcldemo \ $(if $(filter WNT,$(OS)), \ senddoc \ ) \ |