[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20988-g915b24d

[Madhura Jayaratne]

The branch, master has been updated
       via  915b24df79f39c3213ff828c08e1bdf955f9ab0d (commit)
       via  acf2a3b472cc468f6120a4b70aeb98095b013e30 (commit)
       via  77ad710d08eed759b9404e069e8dd6c1ea9f802f (commit)
      from  e03dcf766976fe6dfffb75d4aa3c8cf2f76acffa (commit)


- Log -----------------------------------------------------------------
commit 915b24df79f39c3213ff828c08e1bdf955f9ab0d
Merge: acf2a3b e03dcf7
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Fri Oct 14 20:32:38 2011 +0530

    Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit acf2a3b472cc468f6120a4b70aeb98095b013e30
Merge: 52871d9 77ad710
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Fri Oct 14 20:21:09 2011 +0530

    Merge branch 'QA_3_4'
    
    Conflicts:
    	libraries/export/pdf.php

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

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

diff --git a/ChangeLog b/ChangeLog
index e1ae966..06894fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,7 @@ phpMyAdmin - ChangeLog
 - bug [view] View renaming did not work
 - bug [navi] Wrong icon for view (MySQL 5.5)
 - bug #3420229 [doc] Missing documentation section
+- bug #3423725 [pdf] Broken PDF file when exporting database to PDF
 
 3.4.6.0 (not yet released)
 - patch #3404173 InnoDB comment display with tooltips/aliases


hooks/post-receive
-- 
phpMyAdmin