Dual licensing: Apache or GPL

This commit is contained in:
Jakub Vrana 2010-11-09 12:59:51 +01:00
parent 15ccbec1fd
commit 8aac3b6e05
4 changed files with 4 additions and 1 deletions

View file

@ -4,6 +4,7 @@
* @author Jakub Vrana, http://www.vrana.cz/ * @author Jakub Vrana, http://www.vrana.cz/
* @copyright 2007 Jakub Vrana * @copyright 2007 Jakub Vrana
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 * @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"; include "./include/bootstrap.inc.php";

View file

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

View file

@ -4,6 +4,7 @@
* @author Jakub Vrana, http://www.vrana.cz/ * @author Jakub Vrana, http://www.vrana.cz/
* @copyright 2009 Jakub Vrana * @copyright 2009 Jakub Vrana
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0 * @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"; include "../adminer/include/bootstrap.inc.php";

View file

@ -4,7 +4,7 @@ Adminer Editor - Data manipulation for end-users
http://www.adminer.org/ http://www.adminer.org/
Supports: MySQL, PostgreSQL, SQLite, MS SQL, Oracle Supports: MySQL, PostgreSQL, SQLite, MS SQL, Oracle
Requirements: PHP 4.3.3+ or PHP 5+ 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 adminer/index.php - Run development version of Adminer
editor/index.php - Run development version of Adminer Editor editor/index.php - Run development version of Adminer Editor