The branch, master has been updated
via 6b786f7c55dd6419533b2d3b82685a375f498195 (commit)
via 75c4a2ed45ab3af072ed25d81d4216186c350fe2 (commit)
via ad5c7f5d0ae4e0eda4089cd760b64e4b53f0cf70 (commit)
from e0d13c57f9d4d68d06f4d0cb6f4c7d09812a906c (commit)
- Log -----------------------------------------------------------------
commit 6b786f7c55dd6419533b2d3b82685a375f498195
Merge: 75c4a2e e0d13c5
Author: Madhura Jayaratne <[email protected]>
Date: Wed Oct 5 21:00:22 2011 +0530
Merge branch 'master' of
ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 75c4a2ed45ab3af072ed25d81d4216186c350fe2
Merge: 0cacdc7 ad5c7f5
Author: Madhura Jayaratne <[email protected]>
Date: Wed Oct 5 20:22:47 2011 +0530
Merge branch 'QA_3_4'
Conflicts:
js/sql.js
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 69ac90e..ec72763 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog
3.4.7.0 (not yet released)
- bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] =
false
+- bug #3418849 [interface] Inline edit shows dropdowns even after closing
3.4.6.0 (not yet released)
- patch #3404173 InnoDB comment display with tooltips/aliases
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
