Changeset 54b69e2 in confclerk_git for src/gui/about.ui


Ignore:
Timestamp:
01/13/15 23:27:16 (8 years ago)
Author:
Philipp Spitzer <philipp@…>
Branches:
master, qt5
Children:
ebe26af
Parents:
4b6ae6b
Message:

Merged changes from trunk. It still compiles successfully. :-)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gui/about.ui

    r4b6ae6b r54b69e2  
    138138&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;ConfClerk is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version.&lt;/p&gt;
    139139&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;ConfClerk is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.&lt;/p&gt;
    140 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright (C) 2010 Ixonos Plc.&lt;br /&gt;Copyright (C) 2011-2013 Philipp Spitzer &amp;amp; gregor herrmann&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     140&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright (C) 2010 Ixonos Plc.&lt;br /&gt;Copyright (C) 2011-2014 Philipp Spitzer &amp;amp; gregor herrmann &amp;amp; Stefan Strahl&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    141141         </property>
    142142         <property name="textFormat">
Note: See TracChangeset for help on using the changeset viewer.