[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cui/source LICENSE_ALv2 NOTICE README

Ariel Constenla-Haile arielch at apache.org
Thu Sep 15 08:17:38 UTC 2016


 LICENSE_ALv2                 |    2 +-
 NOTICE                       |    2 +-
 README                       |    2 +-
 cui/source/dialogs/about.cxx |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4a6a8cf0700282052af625cddbe151d1bc029427
Author: Ariel Constenla-Haile <arielch at apache.org>
Date:   Mon Sep 12 23:46:32 2016 +0000

    i127108 - Update the Copyright year

diff --git a/LICENSE_ALv2 b/LICENSE_ALv2
index 3a2f450..729d018 100644
--- a/LICENSE_ALv2
+++ b/LICENSE_ALv2
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2011, 2012, 2013, 2014, 2015 Apache Software Foundation
+   Copyright 2011, 2012, 2013, 2014, 2015, 2016 Apache Software Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/NOTICE b/NOTICE
index e3e3a97..45f9255 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache OpenOffice (http://www.openoffice.org)
-Copyright 2011, 2015 The Apache Software Foundation
+Copyright 2011, 2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index a457c2d..c002ded 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -311,7 +311,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId  & rId ) :
     sbcopyright.appendAscii("Copyright ");
     sbcopyright.append((sal_Unicode)0x00a9);
     sbcopyright.appendAscii(" ");
-    rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2015") );
+    rtl::OUString sYear( RTL_CONSTASCII_USTRINGPARAM("2016") );
     if (vendor.EqualsAscii("Apache Software Foundation")) {
         sbcopyright.append(sYear);
         sbcopyright.appendAscii(" The Apache Software Foundation.\n\n");
commit 0311bcf35b7f0c7251fe9cc68dd512446089e5b5
Author: Jim Jagielski <jim at apache.org>
Date:   Thu Sep 8 21:34:50 2016 +0000

    Correct subdir name

diff --git a/README b/README
index 833905f..1555075 100644
--- a/README
+++ b/README
@@ -54,4 +54,4 @@ Building Apache OpenOffice
 
     The default build will produce a setup version (e.g. setup program on windows, dmg on Mac OS, 
     rpm and deb packages on Linux, pkg packages on Solaris) and an archived version. The output
-    can be found in the <output> directory in instsetoo_native/<output_dir>/OpenOffice/...
+    can be found in the <output> directory in instsetoo_native/<output_dir>/Apache_OpenOffice/...


More information about the Libreoffice-commits mailing list