[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 6cec91: libraries/common.lib.php might have not been loade...
Madhura Jayaratne
madhura.cj at gmail.com
Sun Feb 19 17:08:01 CET 2012
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 6cec91e80598d2422e89849f26887de9ae6dc49a
https://github.com/phpmyadmin/phpmyadmin/commit/6cec91e80598d2422e89849f26887de9ae6dc49a
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2012-02-19 (Sun, 19 Feb 2012)
Changed paths:
M libraries/Error.class.php
M libraries/common.lib.php
Log Message:
-----------
libraries/common.lib.php might have not been loaded by the time PMA_isSerializable() is called.
Commit: 91ae515cb118e66842e2b0d1034d6caab107a0d6
https://github.com/phpmyadmin/phpmyadmin/commit/91ae515cb118e66842e2b0d1034d6caab107a0d6
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2012-02-19 (Sun, 19 Feb 2012)
Changed paths:
M ChangeLog
M js/replication.js
Log Message:
-----------
Merge branch 'QA_3_4' of github.com:phpmyadmin/phpmyadmin into QA_3_4
Commit: 3fadd41b41f14ff432ced4ae703db88b240415ca
https://github.com/phpmyadmin/phpmyadmin/commit/3fadd41b41f14ff432ced4ae703db88b240415ca
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2012-02-19 (Sun, 19 Feb 2012)
Changed paths:
M libraries/Error.class.php
M libraries/common.lib.php
Log Message:
-----------
Merge branch 'QA_3_4' into QA_3_5
Conflicts:
libraries/common.lib.php
Commit: 4145cf04ab521c8570afd3ea2c3a1c2d22564102
https://github.com/phpmyadmin/phpmyadmin/commit/4145cf04ab521c8570afd3ea2c3a1c2d22564102
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date: 2012-02-19 (Sun, 19 Feb 2012)
Changed paths:
M libraries/Error.class.php
M libraries/common.lib.php
Log Message:
-----------
Merge branch 'QA_3_5'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d95f93c...4145cf0
More information about the Git
mailing list