Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1e27b20a8bcc75258bd35de9fe10e80d80b1c69c https://github.com/phpmyadmin/phpmyadmin/commit/1e27b20a8bcc75258bd35de9fe10... Author: Bradley M. Kuhn <bkuhn@ebb.org> Date: 2013-10-01 (Tue, 01 Oct 2013) Changed paths: M js/jquery/src/README Log Message: ----------- Reminder for developers to update jQuery sources when updating minified version. Sources in js/jquery/src should be updated along with any updates to the minified/concatenated version, so that the sources always correspond properly. Commit: 5338162feea7ab8581a6e9fa71a82c10ec05b87b https://github.com/phpmyadmin/phpmyadmin/commit/5338162feea7ab8581a6e9fa71a8... Author: Bradley M. Kuhn <bkuhn@ebb.org> Date: 2013-10-01 (Tue, 01 Oct 2013) Changed paths: M libraries/bfShapeFiles/ShapeFile.lib.php Log Message: ----------- Correct and complete license notices for bfShapeFiles. I downloaded bfShapeFiles from http://bfshapefiles.sourceforge.net/ Exact URL was: http://softlayer-dal.dl.sourceforge.net/project/bfshapefiles/bfshapefiles/0.... and the sha256sum of that zip file was 40c3e575397cede5342493ca12950fb0e2e9ef6b1e7fd1bf1337e9ac9f24f11c I see that the file in that zip file named bfShapeFiles-0.0.2/lib/ShapeFile.lib.php appears to be nearly identical to this ShapeFile.lib.php in the phpMyAdmin repository. Thus, I have taken the copyright and license notice from bfShapeFiles-0.0.2/README.TXT and included it herein, so that full copyright notice is properly displayed. Furthermore, I note that since the notice does not refer to a specific version of the GNU GPL, and that bfShapeFiles-0.0.2/GPL.TXT includes a copy of GPLv2. This means that per GPLv2§9, the bfShapeFiles-0.0.2/lib/ShapeFile.lib.php was licensed to the phpMyAdmin project under GPLv2-or-later. I have thusly updated the @license link to so indicate. Commit: 8d8b3632212c5c9b1f407d79d4405b87bc2c9038 https://github.com/phpmyadmin/phpmyadmin/commit/8d8b3632212c5c9b1f407d79d440... Author: Michal Čihař <mcihar@suse.cz> Date: 2013-10-02 (Wed, 02 Oct 2013) Changed paths: M js/jquery/src/README M libraries/bfShapeFiles/ShapeFile.lib.php Log Message: ----------- Merge branch 'license-fixes' of git://github.com/bkuhn/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6e0b5e4e1be0...8d8b3632212c