diff options
author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:29:39 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:29:39 +0100 |
commit | c939070f709143482ce749603c0e1f0d84df443c (patch) | |
tree | c7ed48d5fa87e8ec699f006f49404ce6aa538925 /desktop | |
parent | a0f911669be348a5539687e4ebe25446d526b2a8 (diff) | |
parent | 066ee33f2754e36cf7b6c39d2c2bff3b31f55951 (diff) |
Merge commit 'libreoffice-3.3.0.2'
Conflicts:
sfx2/source/appl/sfxhelp.cxx
sfx2/source/appl/shutdowniconunx.cxx
sfx2/source/menu/virtmenu.cxx
sysui/desktop/share/create_tree.sh
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/util/template.manifest | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/util/template.manifest b/desktop/util/template.manifest index f5b196a5edf5..d3bd0c101f2f 100644 --- a/desktop/util/template.manifest +++ b/desktop/util/template.manifest @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="LibreOffice" type="win32" /> -<description>http://www.openoffice.org</description> +<description>http://www.documentfoundation.org</description> <dependency> <dependentAssembly> <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="x86"/> |