Dual licensing: Apache or GPL

diff --git a/adminer/index.php b/adminer/index.php
index b72f0bc80d6b446e020af3eac4f443b1a209eb43..cf3c1a6a1a68715e0263e7228b683784b470dcea 100644 (file)
--- a/adminer/index.php
+++ b/adminer/index.php
@@ -4,6 +4,7 @@
 * @author Jakub Vrana, http://www.vrana.cz/
 * @copyright 2007 Jakub Vrana
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
+* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 
 include "./include/bootstrap.inc.php";

diff --git a/changes.txt b/changes.txt
index aecc92d32f000e5c0e2e8a8c6e379c1e10bbc139..0ca4729d3f4168ffe3b53e00d1c2bf7975b9b934 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -12,6 +12,7 @@ Support for virtual foreign keys
 Disable XSS "protection" of IE8
 Immunity against zend.ze1_compatibility_mode (bug #3089645)
 Fix last page with empty result set
+Dual licensing: Apache or GPL
 
 Adminer 3.0.1 (released 2010-10-18):
 Send the form by Ctrl+Enter in all textareas

diff --git a/editor/index.php b/editor/index.php
index d46a28951b7433f5efb743b89a3800da43c30244..d902e2202b54e84b172d3909654ab0cda3640cdc 100644 (file)
--- a/editor/index.php
+++ b/editor/index.php
@@ -4,6 +4,7 @@
 * @author Jakub Vrana, http://www.vrana.cz/
 * @copyright 2009 Jakub Vrana
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
+* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 
 include "../adminer/include/bootstrap.inc.php";

diff --git a/readme.txt b/readme.txt
index 07ef7e31d5b0ff9261f3ce4cd9853449aae96d6a..fbe4a16161e8800c6b59c8830db10298ad09db98 100644 (file)
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Adminer Editor - Data manipulation for end-users
 http://www.adminer.org/
 Supports: MySQL, PostgreSQL, SQLite, MS SQL, Oracle
 Requirements: PHP 4.3.3+ or PHP 5+
-Apache License, Version 2.0
+Apache License 2.0 or GPL 2
 
 adminer/index.php - Run development version of Adminer
 editor/index.php - Run development version of Adminer Editor