Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 49c7956a7a525b14ce417e10176a99b70745eba7 https://github.com/phpmyadmin/phpmyadmin/commit/49c7956a7a525b14ce417e10176a... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-10 (Tue, 10 Jul 2012)

Changed paths: M libraries/DisplayResults.class.php M sql.php

Log Message: ----------- Introduce new function to set properties in PMA_DisplayResults class

Commit: 384f446a17c848ca8d3336bf690ce6022ea52214 https://github.com/phpmyadmin/phpmyadmin/commit/384f446a17c848ca8d3336bf690c... Author: Chanaka Indrajith pe.chanaka.ck@gmail.com Date: 2012-07-10 (Tue, 10 Jul 2012)

Changed paths: M po/cs.po M po/es.po M po/nb.po M po/pt_BR.po M test/classes/PMA_DisplayResults_test.php M test/classes/PMA_Theme_test.php M test/libraries/PMA_bookmark_test.php A test/libraries/PMA_mime_test.php

Log Message: ----------- Merge remote branch 'upstream/master'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fb4f8d712186...384f446a17c8