Write 1.4.0 changelog.

[nageru] / ui_aboutdialog.ui

diff --git a/ui_aboutdialog.ui b/ui_aboutdialog.ui
index 3e9008decae212831a96558bdb6862c43cef90d4..4b2e501828741cf0cc9a2f1b38bf19ee694b2c84 100644 (file)
--- a/ui_aboutdialog.ui
+++ b/ui_aboutdialog.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>&lt;p&gt;&lt;b&gt;Nageru v1.0.0&lt;/b&gt;&lt;/p&gt;
+      <string>&lt;p&gt;&lt;b&gt;Nageru 1.3.4&lt;/b&gt;&lt;/p&gt;
 
 &lt;p&gt;Realtime video mixer&lt;/p&gt;</string>
      </property>
@@ -32,10 +32,11 @@
       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;/head&gt;&lt;body&gt;
 &lt;p&gt;
-Nageru is Copyright (C) 2015 Steinar H. Gunderson &amp;lt;sgunderson@bigfoot.com&amp;gt;&lt;br /&gt;
+Nageru is Copyright (C) 2015 Steinar H. Gunderson &amp;lt;steinar+nageru@gunderson.no&amp;gt;&lt;br /&gt;
 Portions Copyright (C) 2003 Rune Holm.&lt;br /&gt;
 Portions Copyright (C) 2010-2011 Fons Adriaensen &amp;lt;fons@linuxaudio.org&amp;gt;&lt;br /&gt;
 Portions Copyright (C) 2012-2015 Fons Adriaensen &amp;lt;fons@linuxaudio.org&amp;gt;&lt;br /&gt;
+Portions Copyright (C) 2008-2015 Fons Adriaensen &amp;lt;fons@linuxaudio.org&amp;gt;&lt;br /&gt;
 Portions Copyright (c) 2007-2013 Intel Corporation. All Rights Reserved.&lt;/p&gt;
 
 &lt;p&gt;This program is free software: you can redistribute it and/or modify&lt;br /&gt;
@@ -75,6 +76,33 @@ ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,&lt;br /
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE&lt;br /&gt;
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.&lt;/p&gt;
 
+&lt;p&gt;&lt;br /&gt;All files in decklink/:&lt;/p&gt;
+
+&lt;p&gt;Copyright (c) 2009 Blackmagic Design&lt;br /&gt;
+Copyright (c) 2015 Blackmagic Design&lt;/p&gt;
+
+&lt;p&gt;Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:&lt;/p&gt;
+
+&lt;p&gt;The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.&lt;/p&gt;
+
+&lt;p&gt;THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.&lt;/p&gt;
+
 &lt;/body&gt;&lt;/html&gt;
        </string>
      </property>