Branch: refs/heads/QA_4_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 796e6ae09301a7ea8aae74fdb3bb44538c0f5151 https://github.com/phpmyadmin/phpmyadmin/commit/796e6ae09301a7ea8aae74fdb3bb... Author: Marc Delisle marc@infomarc.info Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths: M ChangeLog M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.5.0 release
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: b5c731ab62e4f85b5f6beeca064796b0c946ed20 https://github.com/phpmyadmin/phpmyadmin/commit/b5c731ab62e4f85b5f6beeca0647... Author: Nisarg Jhaveri nisargjhaveri@gmail.com Date: 2015-09-24 (Thu, 24 Sep 2015)
Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.class.php
Log Message: ----------- Backport 053edda33f5bd957726b8bc82167ec8d30e705bc
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 9e08133f49f0b99868fec434762366d08a45b6f8 https://github.com/phpmyadmin/phpmyadmin/commit/9e08133f49f0b99868fec4347623... Author: Marc Delisle marc@infomarc.info Date: 2015-09-24 (Thu, 24 Sep 2015)
Changed paths: M README M doc/conf.py M libraries/Config.class.php
Log Message: ----------- 4.5.0.1 release
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 8d202a3dc13a4296ef5809831889f0b86256a31d https://github.com/phpmyadmin/phpmyadmin/commit/8d202a3dc13a4296ef5809831889... Author: Dan Ungureanu udan1107@gmail.com Date: 2015-09-25 (Fri, 25 Sep 2015)
Changed paths: M libraries/plugins/export/ExportSql.class.php M libraries/sql-parser/src/Components/Key.php M libraries/sql-parser/src/Utils/Table.php
Log Message: ----------- Fixes #11497. Cherry-picked udan11/sql-parser@1415469.
Signed-off-by: Dan Ungureanu udan1107@gmail.com Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 440aaaacaeac658f3149253f1a6834ef2f229586 https://github.com/phpmyadmin/phpmyadmin/commit/440aaaacaeac658f3149253f1a68... Author: Marc Delisle marc@infomarc.info Date: 2015-09-25 (Fri, 25 Sep 2015)
Changed paths: M ChangeLog
Log Message: ----------- ChangeLog entry
Signed-off-by: Marc Delisle marc@infomarc.info
Commit: 8afe5940da4d04863022977d31200c4635d47d37 https://github.com/phpmyadmin/phpmyadmin/commit/8afe5940da4d04863022977d3120... Author: Marc Delisle marc@infomarc.info Date: 2015-09-25 (Fri, 25 Sep 2015)
Log Message: ----------- Merge commit '9e08133' into QA_4_5
Commit: ac33a96ba8a7911dc977da8c891d8d1518f0b285 https://github.com/phpmyadmin/phpmyadmin/commit/ac33a96ba8a7911dc977da8c891d... Author: Marc Delisle marc@infomarc.info Date: 2015-09-25 (Fri, 25 Sep 2015)
Changed paths: M ChangeLog M libraries/plugins/export/ExportSql.class.php M libraries/sql-parser/src/Components/Key.php M libraries/sql-parser/src/Utils/Table.php
Log Message: ----------- Fix merge conflict
Signed-off-by: Marc Delisle marc@infomarc.info
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a2fc766269e7...ac33a96ba8a7