diff --git a/adminer/index.php b/adminer/index.php index b72f0bc8..cf3c1a6a 100644 --- 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 aecc92d3..0ca4729d 100644 --- 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 d46a2895..d902e220 100644 --- 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 07ef7e31..fbe4a161 100644 --- 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