[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_6-9323-g0bf02f0

[Michal Čihař]

The branch, master has been updated
       via  0bf02f05f14065bc4f67218f9c089099fad41cb1 (commit)
       via  061b87f11f09633fbfe21d8c35f520ca9b80ff60 (commit)
       via  ca18fad776bd845fff3db5d3381434a7384e24d5 (commit)
      from  4f487780a07d2a89e97bb3249fd4389c7362681a (commit)


- Log -----------------------------------------------------------------
commit 0bf02f05f14065bc4f67218f9c089099fad41cb1
Merge: 4f487780a07d2a89e97bb3249fd4389c7362681a 061b87f11f09633fbfe21d8c35f520ca9b80ff60
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon Aug 30 17:24:55 2010 +0200

    Merge branch 'QA_3_3'
    
    Conflicts:
    	libraries/sqlparser.data.php
    	pdf_pages.php

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

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

diff --git a/ChangeLog b/ChangeLog
index bdbba03..23ee447 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -118,6 +118,7 @@ $Id$
 - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after
   a page size increase, thanks to Martin Schönberger - mad05
 - bug #3054458 [core] Fixed displaying number of rows.
+- bug #3035300 [parser] Fixed wrong definition of keywords.
 
 3.3.6.0 (2010-08-28)
 - bug #3033063 [core] Navi gets wrong db name


hooks/post-receive
-- 
phpMyAdmin