3 files changed, 37 insertions, 66 deletions
diff --git a/SQLiteStudio3/coreSQLiteStudio/licenses/fugue_icons.txt b/SQLiteStudio3/coreSQLiteStudio/licenses/fugue_icons.txt
index 4fc7b75..22b0655 100644
--- a/SQLiteStudio3/coreSQLiteStudio/licenses/fugue_icons.txt
+++ b/SQLiteStudio3/coreSQLiteStudio/licenses/fugue_icons.txt
@@ -13,68 +13,3 @@ purchase a royalty-free license.
 I'm unavailable for custom icon design work. But your
 suggestions are always welcome!
 <mailto:p@yusukekamiyamane.com>
-
-------------------------------------------------------------
-
-All logos and trademarks in some icons are property of their
-respective owners.
-
-------------------------------------------------------------
-
-- geotag
-
-  (C) Geotag Icon Project. All rights reserved.
-  <http://www.geotagicons.com/>
-
-  Geotag icon is licensed under a Creative Commons
-  Attribution-Share Alike 3.0 License or LGPL.
-  <http://creativecommons.org/licenses/by-sa/3.0/>
-  <http://opensource.org/licenses/lgpl-license.php>
-
-- language
-
-  (C) Language Icon Project. All rights reserved.
-  <http://www.languageicon.org/>
-
-  Language icon is licensed under a Creative Commons
-  Attribution-Share Alike 3.0 License.
-  <http://creativecommons.org/licenses/by-sa/3.0/>
-
-- open-share
-
-  (C) Open Share Icon Project. All rights reserved.
-  <http://www.openshareicons.com/>
-
-  Open Share icon is licensed under a Creative Commons
-  Attribution-Share Alike 3.0 License.
-  <http://creativecommons.org/licenses/by-sa/3.0/>
-
-- opml
-
-  (C) OPML Icon Project. All rights reserved.
-  <http://opmlicons.com/>
-
-  OPML icon is licensed under a Creative Commons
-  Attribution-Share Alike 2.5 License.
-  <http://creativecommons.org/licenses/by-sa/2.5/>
-
-- share
-
-  (C) Share Icon Project. All rights reserved.
-  <http://shareicons.com/>
-
-  Share icon is licensed under a GPL or LGPL or BSD or
-  Creative Commons Attribution 2.5 License.
-  <http://opensource.org/licenses/gpl-license.php>
-  <http://opensource.org/licenses/lgpl-license.php>
-  <http://opensource.org/licenses/bsd-license.php>
-  <http://creativecommons.org/licenses/by/2.5/>
-
-- xfn
-
-  (C) Wolfgang Bartelme. All rights reserved.
-  <http://www.bartelme.at/>
-
-  XFN icon is licensed under a Creative Commons
-  Attribution-Share Alike 2.5 License.
-  <http://creativecommons.org/licenses/by-sa/2.5/>
-\ No newline at end of file
diff --git a/SQLiteStudio3/coreSQLiteStudio/licenses/gpl.txt b/SQLiteStudio3/coreSQLiteStudio/licenses/gpl.txt
index 10926e8..5225330 100644
--- a/SQLiteStudio3/coreSQLiteStudio/licenses/gpl.txt
+++ b/SQLiteStudio3/coreSQLiteStudio/licenses/gpl.txt
@@ -1,3 +1,16 @@
+SQLiteStudio is licensed under the GNU General Public License version 3 with the
+addition of the following special exception:
+
+In addition, as a special exception, the copyright holders give
+permission to link the code of portions of this program with the OpenSSL
+library.
+You must obey the GNU General Public License in all respects for all of
+the code used other than OpenSSL. If you modify file(s) with this
+exception, you may extend this exception to your version of the file(s),
+but you are not obligated to do so. If you do not wish to do so, delete
+this exception statement from your version. If you delete this exception
+statement from all source files in the program, then also delete it here.                    
+                    
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
@@ -672,4 +685,3 @@ may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
diff --git a/SQLiteStudio3/coreSQLiteStudio/licenses/mit.txt b/SQLiteStudio3/coreSQLiteStudio/licenses/mit.txt
new file mode 100644
index 0000000..85b2a14
--- /dev/null
+++ b/SQLiteStudio3/coreSQLiteStudio/licenses/mit.txt
@@ -0,0 +1,24 @@
+The MIT License (MIT)
+
+Copyright (c) Itay Grudev 2015 - 2016
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+Note: Some of the examples include code not distributed under the terms of the
+MIT License.