[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0BETA1-285-gf0b6472

[Marc Delisle]

The branch, master has been updated
       via  f0b647292bbadb77bcdff5663bedb729a6a7e1d1 (commit)
       via  2f8fdcda24965ec7f0656e82d02e9471cd6ec20f (commit)
       via  496cdc62e6bb832c9d503fe816327fd5406bc335 (commit)
       via  12e2e8b7fc67fe4378d7a60d595345ac92b0912a (commit)
      from  1ee05ae7297c8f53e3745255824577362ddeed69 (commit)


- Log -----------------------------------------------------------------
commit f0b647292bbadb77bcdff5663bedb729a6a7e1d1
Merge: 1ee05ae 2f8fdcd
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Jan 30 03:56:26 2012 -0500

    Merge branch 'QA_3_5'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53c143a..9123356 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,7 @@ phpMyAdmin - ChangeLog
 - patch #3458944 [operations] copy table data missing SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'
 - bug #3469254 [edit] Setting data to NULL and drop-downs
 - bug #3477063 [edit] Missing set fields and values in generated INSERT query
+- bug #3460867 [libraries] license issue with TCPDF (updated to 5.9.145)
 
 3.4.9.0 (2011-12-21)
 - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown


hooks/post-receive
-- 
phpMyAdmin