Skip to content

Commit 862af27

Browse files
committed
Merge branch 'master' into sqlb-3.x
2 parents adc9934 + 4a231c5 commit 862af27

File tree

6 files changed

+11
-586
lines changed

6 files changed

+11
-586
lines changed

README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ What it is
2424

2525
(taken from the website linked to above; it's still true - now even more)
2626

27-
SQLite Database Browser is a freeware, public domain, open source visual tool
28-
used to create, design and edit database files compatible with SQLite. It is
29-
meant to be used for users and developers that want to create databases, edit
30-
and search data using a familiar spreadsheet-like interface, without the need
31-
to learn complicated SQL commands.
27+
SQLite Database Browser is a freeware, open source visual tool used to create,
28+
design and edit database files compatible with SQLite. It is meant to be used
29+
for users and developers that want to create databases, edit and search data
30+
using a familiar spreadsheet-like interface, without the need to learn
31+
complicated SQL commands.
3232

3333
What's been done since then
3434
---------------------------

src/AboutDialog.ui

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>531</width>
10-
<height>329</height>
10+
<height>371</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -24,7 +24,7 @@
2424
<property name="geometry">
2525
<rect>
2626
<x>160</x>
27-
<y>280</y>
27+
<y>330</y>
2828
<width>351</width>
2929
<height>32</height>
3030
</rect>
@@ -71,11 +71,11 @@
7171
<x>20</x>
7272
<y>110</y>
7373
<width>491</width>
74-
<height>161</height>
74+
<height>211</height>
7575
</rect>
7676
</property>
7777
<property name="text">
78-
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:large;&quot;&gt;SQLite Database Browser is an open source, public domain, freeware visual tool used to create, design and edit SQLite database files.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;For more information on this program please visit our site at: &lt;a href=&quot;https://github.com/rp-/sqlitebrowser&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/rp-/sqlitebrowser&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:small;&quot;&gt;This software uses the LGPL Qt Toolkit from http://www.qtsoftware.com&lt;br/&gt;See LICENSING.txt and Qt_LICENSE_LGPL.txt for licensing terms and information.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
78+
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;SQLite Database Browser is an open source, freeware visual tool used to create, design and edit SQLite database files.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;This program 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 3 of the License, or (at your option) any later version.&lt;br/&gt;See &lt;a href=&quot;http://www.gnu.org/licenses/gpl.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.gnu.org/licenses/gpl.html&lt;/span&gt;&lt;/a&gt; for details.&lt;/p&gt;&lt;p&gt;For more information on this program please visit our site at: &lt;a href=&quot;https://github.com/rp-/sqlitebrowser&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/rp-/sqlitebrowser&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:small;&quot;&gt;This software uses the LGPL Qt Toolkit from http://www.qtsoftware.com&lt;br/&gt;See LICENSING.txt and Qt_LICENSE_LGPL.txt for licensing terms and information.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
7979
</property>
8080
<property name="scaledContents">
8181
<bool>false</bool>

src/CREDITS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
The Icons are licensed under a Creative Commons Attribution 2.5 and 3.0 license.
2+
They were made by Mark James, also see http://www.famfamfam.com/lab/icons/silk/

src/LICENSING.txt

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/Qt_LGPL_EXCEPTION.txt

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)