Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a4183c6da2c5a604aff5ed155a29f0ed2ad8db1d https://github.com/phpmyadmin/phpmyadmin/commit/a4183c6da2c5a604aff5ed155a29... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-02-17 (Fri, 17 Feb 2012)

Changed paths: M libraries/database_interface.lib.php

Log Message: ----------- bug #3482113 [edit] Column '0' not changeable

Commit: 0d1407f178dcd8cf97de424b3611b51043f08377 https://github.com/phpmyadmin/phpmyadmin/commit/0d1407f178dcd8cf97de424b3611... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-02-18 (Sat, 18 Feb 2012)

Changed paths: M ChangeLog M libraries/Error.class.php M libraries/common.lib.php M libraries/import/xml.php

Log Message: ----------- bug #3486970 [import] Exception on XML import

Commit: e14b73d23e20bd334e92180518ada71e6654f96d https://github.com/phpmyadmin/phpmyadmin/commit/e14b73d23e20bd334e92180518ad... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-02-18 (Sat, 18 Feb 2012)

Changed paths: M ChangeLog M libraries/Error.class.php M libraries/common.lib.php M libraries/import/xml.php

Log Message: ----------- Merge branch 'QA_3_4' into QA_3_5

Conflicts: libraries/common.lib.php

Commit: 48cbfe14efe6716ba01f447cc4bb25c5f1b7acdd https://github.com/phpmyadmin/phpmyadmin/commit/48cbfe14efe6716ba01f447cc4bb... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-02-18 (Sat, 18 Feb 2012)

Changed paths: M libraries/data_drizzle.inc.php M libraries/database_interface.lib.php M po/id.po M po/ja.po M po/ko.po M po/nl.po

Log Message: ----------- Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5

Commit: 374062112eefff69a4baa6c8bfe018bef9847e01 https://github.com/phpmyadmin/phpmyadmin/commit/374062112eefff69a4baa6c8bfe0... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-02-18 (Sat, 18 Feb 2012)

Changed paths: M ChangeLog M libraries/Error.class.php M libraries/common.lib.php M libraries/data_drizzle.inc.php M libraries/database_interface.lib.php M libraries/import/xml.php M po/id.po M po/ja.po M po/ko.po M po/nl.po

Log Message: ----------- Merge branch 'QA_3_5'

Commit: b3a70fe3527031cbd7d91c28ce8f2ccff4a63e94 https://github.com/phpmyadmin/phpmyadmin/commit/b3a70fe3527031cbd7d91c28ce8f... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-02-18 (Sat, 18 Feb 2012)

Changed paths: M Documentation.html R bs_disp_as_mime_type.php R bs_play_media.php M db_operations.php M db_structure.php M js/functions.js M js/messages.php M libraries/File.class.php R libraries/blobstreaming.lib.php M libraries/common.inc.php M libraries/common.lib.php M libraries/core.lib.php M libraries/display_tbl.lib.php R libraries/engines/pbms.lib.php M libraries/engines/pbxt.lib.php M server_engines.php M tbl_change.php M tbl_replace.php

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b18a866...b3a70fe