- rel. down to 1, rm outdated comment

[packages/phpMyAdmin.git] / phpMyAdmin-config.patch

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index fb88fea468559d763f2d67bc7137169fbf592a83..f21e488350905b83d69fa21db3bb14a39fd75c94 100644 (file)
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,7 +1,17 @@
-diff -uNr phpMyAdmin-2.5.6-rc1/config.inc.php phpMyAdmin-2.5.6-rc1.new/config.inc.php
---- phpMyAdmin-2.5.6-rc1/config.inc.php        Fri Jan  2 20:31:58 2004
-+++ phpMyAdmin-2.5.6-rc1.new/config.inc.php    Sat Feb  7 19:17:43 2004
-@@ -79,8 +79,8 @@
+diff -ur phpMyAdmin.orig/libraries/config.default.php phpMyAdmin/libraries/config.default.php
+--- phpMyAdmin.orig/libraries/config.default.php       2005-11-23 11:34:32.000000000 +0100
++++ phpMyAdmin/libraries/config.default.php    2005-12-19 21:02:34.565280520 +0100
+@@ -1,8 +1,6 @@
+ <?php
+ 
+-/* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
+-
+-/* $Id$ */
++/* $Id$ */
+ // vim: expandtab sw=4 ts=4 sts=4:
+ 
+ /**
+@@ -68,8 +66,8 @@
                                                      // The controluser is also
                                                      // used for all relational
                                                      // features (pmadb)