Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: a97b9b92d27f70f72f65fb896e1c2ee444d3d01a
      
https://github.com/phpmyadmin/phpmyadmin/commit/a97b9b92d27f70f72f65fb896e1c2ee444d3d01a
  Author: Chanaka Indrajith <[email protected]>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M libraries/DisplayResults.class.php

  Log Message:
  -----------
  Fix some code violations in PMA_DisplayResults class


  Commit: 65f24f0e363d62a1805e326a74577120bc05229b
      
https://github.com/phpmyadmin/phpmyadmin/commit/65f24f0e363d62a1805e326a74577120bc05229b
  Author: Chanaka Indrajith <[email protected]>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

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

  Log Message:
  -----------
  Renamed the function processParams() in PMA_DisplayResults class, to 
setProperties()


  Commit: aaa8d22d783267cf65e7e67d16f468880c19396f
      
https://github.com/phpmyadmin/phpmyadmin/commit/aaa8d22d783267cf65e7e67d16f468880c19396f
  Author: Chanaka Indrajith <[email protected]>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M libraries/DbSearch.class.php
    M libraries/DisplayResults.class.php
    M libraries/Menu.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/insert_edit.lib.php
    M libraries/schema/Pdf_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    M main.php
    M po/pt_BR.po

  Log Message:
  -----------
  Resolved conflicts


  Commit: c502a45cc732d9d133945b4f78e301f0ba9c287a
      
https://github.com/phpmyadmin/phpmyadmin/commit/c502a45cc732d9d133945b4f78e301f0ba9c287a
  Author: Michal Čihař <[email protected]>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

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

  Log Message:
  -----------
  Merge remote-tracking branch 'chanaka/master'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/60d0c8a13294...c502a45cc732
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to