Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: ddbe5aed270142b478cf261283ae015da9bfece2
https://github.com/phpmyadmin/phpmyadmin/commit/ddbe5aed270142b478cf261283ae015da9bfece2
Author: Ann + J.M <phpmyad...@zweisteinsoft.de>
Date: 2014-05-21 (Wed, 21 May 2014)
Changed paths:
M libraries/DBQbe.class.php
Log Message:
-----------
DBQbe::_getInsDelAndOrCell: Fix PHPDoc param type
Commit: 5ddd0c1990ebd54722fb95c156866d0ef25eccfc
https://github.com/phpmyadmin/phpmyadmin/commit/5ddd0c1990ebd54722fb95c156866d0ef25eccfc
Author: Ann + J.M <phpmyad...@zweisteinsoft.de>
Date: 2014-05-21 (Wed, 21 May 2014)
Changed paths:
M libraries/Tracker.class.php
M libraries/Util.class.php
M libraries/tbl_tracking.lib.php
M libraries/url_generating.lib.php
M test/classes/PMA_DisplayResults_test.php
M test/classes/config/PMA_FormDisplay_test.php
M test/libraries/PMA_insert_edit_test.php
M test/libraries/PMA_relation_cleanup_test.php
M test/libraries/PMA_server_status_test.php
Log Message:
-----------
Code style fixes
Signed-off-by: Ann + J.M <phpmyad...@zweisteinsoft.de>
Commit: 1acfaf4a7fe0fbfd1869748d6555ad0ece36e0cd
https://github.com/phpmyadmin/phpmyadmin/commit/1acfaf4a7fe0fbfd1869748d6555ad0ece36e0cd
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M libraries/DBQbe.class.php
Log Message:
-----------
Merge commit 'ddbe5ae'
Commit: 9373e1b2041a21d51be6d5ecde5a96a6e228c238
https://github.com/phpmyadmin/phpmyadmin/commit/9373e1b2041a21d51be6d5ecde5a96a6e228c238
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-05-23 (Fri, 23 May 2014)
Changed paths:
M libraries/Tracker.class.php
M libraries/Util.class.php
M libraries/tbl_tracking.lib.php
M libraries/url_generating.lib.php
M test/classes/PMA_DisplayResults_test.php
M test/classes/config/PMA_FormDisplay_test.php
M test/libraries/PMA_insert_edit_test.php
M test/libraries/PMA_relation_cleanup_test.php
M test/libraries/PMA_server_status_test.php
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <m...@infomarc.info>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/e98a9a7bdb4e...9373e1b2041a------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
