Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f8d4f21ef9aec0eed4df4d1009257b3ffbee97d5 https://github.com/phpmyadmin/phpmyadmin/commit/f8d4f21ef9aec0eed4df4d100925... Author: Rouslan Placella rouslan@placella.com Date: 2012-04-02 (Mon, 02 Apr 2012)

Changed paths: M tbl_export.php

Log Message: ----------- Revert "Fixed missing Codemirror for inline query edit when exporting a result set"

This reverts commit 3998a38900130f3d4de53f431e4e865e182ea638.

Commit: 322ea313bc8b94f9f69bac4874d3d73b6c536e96 https://github.com/phpmyadmin/phpmyadmin/commit/322ea313bc8b94f9f69bac4874d3... Author: Rouslan Placella rouslan@placella.com Date: 2012-04-02 (Mon, 02 Apr 2012)

Changed paths: M Documentation.html M po/de.po M po/es.po M po/fr.po M po/ja.po M po/lt.po M po/nl.po M po/ro.po M po/si.po M po/tr.po M scripts/decode_bug.php M tbl_export.php

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

Commit: 24726360c436efd317f58d0f7cb5ed5cc9aa315f https://github.com/phpmyadmin/phpmyadmin/commit/24726360c436efd317f58d0f7cb5... Author: Rouslan Placella rouslan@placella.com Date: 2012-04-02 (Mon, 02 Apr 2012)

Changed paths: M tbl_export.php

Log Message: ----------- Fixed missing Codemirror for inline query edit when exporting a result set

Commit: 4c52281a93cd8eea25ee764f026d6902d4c29e8d https://github.com/phpmyadmin/phpmyadmin/commit/4c52281a93cd8eea25ee764f026d... Author: Rouslan Placella rouslan@placella.com Date: 2012-04-02 (Mon, 02 Apr 2012)

Changed paths: M ChangeLog

Log Message: ----------- Updated changelog

Commit: 64e9dd21cbb2e7c61e154edb7a83b6a2c616a6e3 https://github.com/phpmyadmin/phpmyadmin/commit/64e9dd21cbb2e7c61e154edb7a83... Author: Rouslan Placella rouslan@placella.com Date: 2012-04-02 (Mon, 02 Apr 2012)

Changed paths: M ChangeLog

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

Conflicts: ChangeLog

Commit: 53d427d0b8780f11742f7f25ae97dedaeb3fabd1 https://github.com/phpmyadmin/phpmyadmin/commit/53d427d0b8780f11742f7f25ae97... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-04-02 (Mon, 02 Apr 2012)

Changed paths: M ChangeLog M libraries/parse_analyze.lib.php

Log Message: ----------- bug #3512916 [display] Right frame reloads after displaying SQL result(zero rows)

Conflicts:

ChangeLog

Commit: 24996871589eeba6d87db2e2b3b56af868ae98af https://github.com/phpmyadmin/phpmyadmin/commit/24996871589eeba6d87db2e2b3b5... Author: Atul Pratap Singh atul5@users.sourceforge.net Date: 2012-04-02 (Mon, 02 Apr 2012)

Changed paths: M libraries/parse_analyze.lib.php

Log Message: ----------- Fix typo introduced in 89fc70

Commit: 22f57c7fca8490449f4344eacd9bf1cebdae5fc4 https://github.com/phpmyadmin/phpmyadmin/commit/22f57c7fca8490449f4344eacd9b... Author: Rouslan Placella rouslan@placella.com Date: 2012-04-02 (Mon, 02 Apr 2012)

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0787ce9...22f57c7