diff options
| author | Andras Timar <andras.timar@collabora.com> | 2013-10-25 06:38:06 -0700 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-29 12:12:16 +0000 |
| commit | d8e049d4e3971632eb08692905c60130731d9980 (patch) | |
| tree | e381e79f4345c0650f11a3eb1af6366c6d15e87a /setup_native | |
| parent | 69f026fc37cc5be080c02497e8fe3e0b88efa913 (diff) | |
fdo#65102 respect user's choice not to install desktop icon
Using advertised shortcuts -- inspired by Intel AppUp Centre's
requirement -- was not a good idea after all. I revert this,
and I also revert the commit that actually disabled it in
default Windows builds.
This reverts commit aa2450cb51cfc3805c7a596b6b89d70bb133821e.
This reverts commit b40012bd6d0b5387005253f1d3f03929ce4d1ac6.
Change-Id: I5b465574f7a178fadcdca03a0fe0d68d76621341
Reviewed-on: https://gerrit.libreoffice.org/6437
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/Package_misc.mk | 1 | ||||
| -rw-r--r-- | setup_native/source/win32/desktophelper.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/setup_native/Package_misc.mk b/setup_native/Package_misc.mk index fa96a2782d8d..9262fc62974d 100644 --- a/setup_native/Package_misc.mk +++ b/setup_native/Package_misc.mk @@ -18,5 +18,6 @@ $(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/osxdndinstall.png,ma $(eval $(call gb_Package_add_file,setup_native/misc,bin/root3.dat,linux/root3.dat)) $(eval $(call gb_Package_add_file,setup_native/misc,bin/root4.dat,linux/root4.dat)) $(eval $(call gb_Package_add_file,setup_native/misc,bin/root5.dat,linux/root5.dat)) +$(eval $(call gb_Package_add_file,setup_native/misc,bin/desktophelper.txt,win32/desktophelper.txt)) # vim: set noet sw=4 ts=4: diff --git a/setup_native/source/win32/desktophelper.txt b/setup_native/source/win32/desktophelper.txt new file mode 100644 index 000000000000..c7540116c671 --- /dev/null +++ b/setup_native/source/win32/desktophelper.txt @@ -0,0 +1 @@ +# File used for desktop link |