Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2fc0ca777d54a6a561b7695e4147738f8c54fa5a
      
https://github.com/phpmyadmin/phpmyadmin/commit/2fc0ca777d54a6a561b7695e4147738f8c54fa5a
  Author: Hugues Peccatte <hugues.pecca...@gmail.com>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    M libraries/DBQbe.class.php
    M libraries/Error_Handler.class.php
    M libraries/File.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/List.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/OutputBuffering.class.php
    M libraries/RecentTable.class.php
    M libraries/Response.class.php
    M libraries/ServerStatusData.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php

  Log Message:
  -----------
  Update PHPDoc.


  Commit: d3601abf969eba80349a091b4df28ca1e3c4bcc7
      
https://github.com/phpmyadmin/phpmyadmin/commit/d3601abf969eba80349a091b4df28ca1e3c4bcc7
  Author: Hugues Peccatte <hugues.pecca...@gmail.com>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M libraries/Util.class.php
    M libraries/config/ConfigFile.class.php
    M libraries/dbi/DBIDummy.class.php
    M libraries/dbi/DBIMysql.class.php
    M libraries/plugins/PluginManager.class.php
    M libraries/plugins/PluginObserver.class.php
    M 
libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
    M libraries/schema/Dia_Relation_Schema.class.php
    M libraries/schema/Eps_Relation_Schema.class.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/Pdf_Relation_Schema.class.php
    M libraries/schema/Svg_Relation_Schema.class.php
    M setup/lib/ConfigGenerator.class.php

  Log Message:
  -----------
  Global PHPDoc update.


  Commit: 2f1176d27c8c93dcaf2223680b8c3787e1b2de8f
      
https://github.com/phpmyadmin/phpmyadmin/commit/2f1176d27c8c93dcaf2223680b8c3787e1b2de8f
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    M libraries/DBQbe.class.php
    M libraries/Error_Handler.class.php
    M libraries/File.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/List.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/OutputBuffering.class.php
    M libraries/RecentTable.class.php
    M libraries/Response.class.php
    M libraries/ServerStatusData.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Util.class.php
    M libraries/config/ConfigFile.class.php
    M libraries/dbi/DBIDummy.class.php
    M libraries/dbi/DBIMysql.class.php
    M libraries/plugins/PluginManager.class.php
    M libraries/plugins/PluginObserver.class.php
    M 
libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php
    M 
libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
    M libraries/schema/Dia_Relation_Schema.class.php
    M libraries/schema/Eps_Relation_Schema.class.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/Pdf_Relation_Schema.class.php
    M libraries/schema/Svg_Relation_Schema.class.php

  Log Message:
  -----------
  Fix merge conflicts


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/226295fa39b7...2f1176d27c8c
------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most 
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to