Hi Dne Mon, 17 Aug 2009 21:46:16 +0000 drummingds1@users.sourceforge.net napsal(a):

Revision: 12815 http://phpmyadmin.svn.sourceforge.net/phpmyadmin/?rev=12815&view=rev Author: drummingds1 Date: 2009-08-17 21:46:08 +0000 (Mon, 17 Aug 2009)

Log Message: ----------- Additions and change made to documentation, and other minor alterations.

Modified Paths: -------------- branches/gsoc/derek/phpMyAdmin/ChangeLog branches/gsoc/derek/phpMyAdmin/libraries/common.lib.php branches/gsoc/derek/phpMyAdmin/libraries/database_interface.lib.php branches/gsoc/derek/phpMyAdmin/libraries/import/xls.php branches/gsoc/derek/phpMyAdmin/libraries/import/xlsx.php branches/gsoc/derek/phpMyAdmin/libraries/import.lib.php

Property Changed: ---------------- branches/gsoc/derek/phpMyAdmin/

Property changes on: branches/gsoc/derek/phpMyAdmin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/phpMyAdmin:12672-12790 + /trunk/phpMyAdmin:12672-12811

Please do not mix merge commits with regular ones, then it is hard to find out what is actually your change. -- Michal Čihař | http://cihar.com | http://blog.cihar.com