The following commit has been merged in the QA_3_3 branch: commit a2b111b7ef9e756e2f1d28e763142c5b826ffbe3 Author: Herman van Rink rink@initfour.nl Date: Wed Feb 17 15:57:56 2010 +0100

Signed-off-by: Herman van Rink rink@initfour.nl

diff --git a/ChangeLog b/ChangeLog index b2edefe..ea0acff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.1.0 (not yet released) - bug #2941037 [core] Database structure not sorted by table correctly - bug #2948492 [interface] Slide effect masks some fields on search page +- Test

3.3.0.0 (not yet released) + rfe #2308632 [edit] Use hex for (var)binary fields,