Merge pull request #985 from dictoon/master

Update copyright notices in appleseed.studio and command line tools
appleseedhq · Mar 29, 2016 · 42ba647 · 42ba647
2 parents 395f039 + 994d5e2
commit 42ba647
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/appleseed.shared/application/commandlinehandlerbase.cpp b/src/appleseed.shared/application/commandlinehandlerbase.cpp
@@ -231,7 +231,7 @@ void CommandLineHandlerBase::print_version_information(SuperLogger& logger) cons
         "%s, using %s version %s, %s configuration\n"
         "compiled on %s at %s using %s version %s\n"
         "copyright (c) 2010-2013 Francois Beaune, Jupiter Jazz Limited.\n"
-        "copyright (c) 2014-2015 The appleseedhq Organization.\n"
+        "copyright (c) 2014-2016 The appleseedhq Organization.\n"
         "this software is released under the MIT license (http://opensource.org/licenses/MIT).\n"
         "visit http://appleseedhq.net/ for additional information and resources.",
         impl->m_application_name.c_str(),

diff --git a/src/appleseed.studio/help/about/aboutwindow.ui b/src/appleseed.studio/help/about/aboutwindow.ui
@@ -55,7 +55,7 @@
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span&gt;Copyright © 2010-2013 François Beaune, Jupiter Jazz Limited.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span&gt;Copyright © 2014-2015 The appleseedhq Organization.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span&gt;Copyright © 2014-2016 The appleseedhq Organization.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span&gt;This software is released under the &lt;/span&gt;&lt;a href=&quot;http://opensource.org/licenses/MIT&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#be8c32;&quot;&gt;MIT license&lt;/span&gt;&lt;/a&gt;&lt;span&gt;.&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;