[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - desktop/source
Stephan Bergmann
sbergman at redhat.com
Wed Mar 28 07:24:23 UTC 2018
desktop/source/deployment/misc/dp_platform.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e0cdb1e50b77b9a7e93904dd7af0e914a6432abd
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Tue Mar 27 14:13:45 2018 +0200
Fix typo ("x86_64" -> "X86_64")
...introduced with 2d2294fb82bd4f0d1d805405631aeb1acbc36cbb "Add x64 Windows
here, too". As reported by Richard Webb at
<https://lists.freedesktop.org/archives/libreoffice/2018-March/079870.html>
"Re: Manifest.xml for 64bit LO".
Change-Id: I1681908012e73e520bebd79b8149788358ea49a3
Reviewed-on: https://gerrit.libreoffice.org/51946
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
(cherry picked from commit 045e2755163042c3c0bc83595b1c73104cb76721)
Reviewed-on: https://gerrit.libreoffice.org/51951
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index 4bf885941cb7..9a0b364ffe43 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -77,7 +77,7 @@ namespace
else if (token == "windows_x86")
ret = checkOSandCPU("Windows", "x86");
else if (token == "windows_x86_64")
- ret = checkOSandCPU("Windows", "x86_64");
+ ret = checkOSandCPU("Windows", "X86_64");
else if (token == "solaris_sparc")
ret = checkOSandCPU("Solaris", "SPARC");
else if (token == "solaris_sparc64")
More information about the Libreoffice-commits
mailing list