[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7RC1-10019-g0431042
Michal Čihař
nijel at users.sourceforge.net
Tue Sep 7 15:01:13 CEST 2010
The branch, master has been updated
via 0431042bd05a6c580951f7f7497fc237b17919d1 (commit)
from c2be7316e0d88cc4553ff8b5f31f5274fad63064 (commit)
- Log -----------------------------------------------------------------
commit 0431042bd05a6c580951f7f7497fc237b17919d1
Author: Michal Čihař <mcihar at novell.com>
Date: Tue Sep 7 15:00:44 2010 +0200
Drop $Id$ expansion, nobody complained so far it not working.
-----------------------------------------------------------------------
Summary of changes:
CREDITS | 3 ---
ChangeLog | 4 +---
Documentation.html | 4 ----
INSTALL | 2 --
README | 2 --
TODO | 2 --
contrib/README | 2 --
docs.css | 1 -
js/common.js | 1 -
js/db_operations.js | 1 -
js/export.js | 1 -
js/functions.js | 1 -
js/import.js | 1 -
js/indexes.js | 1 -
js/server_privileges.js | 1 -
js/sql.js | 1 -
js/tbl_change.js | 1 -
js/tbl_operations.js | 1 -
js/update-location.js | 1 -
libraries/engines/pbms.lib.php | 1 -
libraries/import/README | 1 -
libraries/schema/Dia_Relation_Schema.class.php | 1 -
libraries/schema/Eps_Relation_Schema.class.php | 1 -
libraries/schema/Export_Relation_Schema.class.php | 1 -
libraries/schema/Pdf_Relation_Schema.class.php | 1 -
libraries/schema/Svg_Relation_Schema.class.php | 1 -
libraries/schema/User_Schema.class.php | 1 -
libraries/schema/Visio_Relation_Schema.class.php | 1 -
libraries/sqlparser.lib.php | 1 -
libraries/tcpdf/font/LICENSE | 2 --
libraries/transformations/TEMPLATE | 1 -
libraries/transformations/TEMPLATE_MIMETYPE | 1 -
libraries/transformations/generator.sh | 1 -
libraries/transformations/template_generator.sh | 1 -
.../transformations/template_generator_mimetype.sh | 1 -
libraries/zip_extension.lib.php | 1 -
pmd/scripts/ajax.js | 1 -
pmd/scripts/iecanvas.js | 1 -
pmd/scripts/move.js | 1 -
pmd/styles/default/style1.css | 1 -
schema_edit.php | 1 -
schema_export.php | 1 -
scripts/convertcfg.pl | 1 -
scripts/create-release.sh | 1 -
scripts/create_tables.sql | 1 -
scripts/lang-cleanup.sh | 1 -
scripts/remove_control_m.sh | 1 -
scripts/upgrade.pl | 1 -
scripts/upgrade_tables_mysql_4_1_2+.sql | 1 -
tbl_chart.php | 1 -
translators.html | 1 -
51 files changed, 1 insertions(+), 63 deletions(-)
diff --git a/CREDITS b/CREDITS
index f692046..71cc78d 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,6 +1,3 @@
-$Id$
-
-
phpMyAdmin - Credits
====================
diff --git a/ChangeLog b/ChangeLog
index 213f954..58e2f8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,6 @@
phpMyAdmin - ChangeLog
----------------------
-$Id$
-
3.4.0.0 (not yet released)
+ rfe #2890226 [view] Enable VIEW rename
+ rfe #838637 [privileges] Export a user's privileges
@@ -317,5 +315,5 @@ $Id$
# vim: et ts=4 sw=4 sts=4
# vim: ft=changelog fenc=utf-8 encoding=utf-8
-# vim: fde=getline(v\:lnum-1)=~'^\\s*$'&&getline(v\:lnum)=~'\\S'?'>1'\:1&&v\:lnum>6&&getline(v\:lnum)!~'^#'
+# vim: fde=getline(v\:lnum-1)=~'^\\s*$'&&getline(v\:lnum)=~'\\S'?'>1'\:1&&v\:lnum>4&&getline(v\:lnum)!~'^#'
# vim: fdn=1 fdm=expr
diff --git a/Documentation.html b/Documentation.html
index ec8412f..5b75982 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -5,7 +5,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
-<!-- $Id$ -->
<head>
<link rel="icon" href="./favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
@@ -53,9 +52,6 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<li>License: <a href="license.php">LICENSE</a></li>
</ul>
</li>
- <li><div class="l10n">Documentation version:</div>
- <i>$Id$</i>
- </li>
</ul>
<!-- REQUIREMENTS -->
diff --git a/INSTALL b/INSTALL
index 29bc6de..56c8948 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,3 @@
-$Id$
-
phpMyAdmin - Installation
-------------------------
diff --git a/README b/README
index 2bc2d1a..4e95e34 100644
--- a/README
+++ b/README
@@ -1,5 +1,3 @@
-$Id$
-
phpMyAdmin - Readme
===================
diff --git a/TODO b/TODO
index 503e029..7e96527 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-$Id$
-
phpMyAdmin - Todo
=================
diff --git a/contrib/README b/contrib/README
index 35be9bc..6e2c9e1 100644
--- a/contrib/README
+++ b/contrib/README
@@ -1,5 +1,3 @@
-$Id$
-
This directory contains various stuff contributed by users that might be
useful to other. There is no guarantee it will work for you.
diff --git a/docs.css b/docs.css
index e9defb7..1d0f08d 100644
--- a/docs.css
+++ b/docs.css
@@ -1,4 +1,3 @@
-/* $Id$ */
/* Stylesheet for phpMyAdmin documentation */
/* vim: expandtab ts=4 sw=4 sts=4 tw=78
*/
diff --git a/js/common.js b/js/common.js
index f0eea25..9a690c6 100644
--- a/js/common.js
+++ b/js/common.js
@@ -2,7 +2,6 @@
/**
* common functions used for communicating between main, navigation and querywindow
*
- * @version $Id$
*/
/**
diff --git a/js/db_operations.js b/js/db_operations.js
index 8bdeea2..a135532 100644
--- a/js/db_operations.js
+++ b/js/db_operations.js
@@ -7,7 +7,6 @@
* @requires jQueryUI
* @requires js/functions.js
*
- * @version $Id$
*/
/**
diff --git a/js/export.js b/js/export.js
index 8f5cba5..1cf9de5 100644
--- a/js/export.js
+++ b/js/export.js
@@ -2,7 +2,6 @@
/**
* Functions used in the export tab
*
- * @version $Id$
*/
/**
diff --git a/js/functions.js b/js/functions.js
index f19344e..6efa1e0 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2,7 +2,6 @@
/**
* general function, usally for data manipulation pages
*
- * @version $Id$
*/
/**
diff --git a/js/import.js b/js/import.js
index be79388..0bcc3d0 100644
--- a/js/import.js
+++ b/js/import.js
@@ -2,7 +2,6 @@
/**
* Functions used in the import tab
*
- * @version $Id$
*/
diff --git a/js/indexes.js b/js/indexes.js
index 3a170bf..b97fcd2 100644
--- a/js/indexes.js
+++ b/js/indexes.js
@@ -2,7 +2,6 @@
/**
* function used for index manipulation pages
*
- * @version $Id$
*/
/**
diff --git a/js/server_privileges.js b/js/server_privileges.js
index 4ecfea0..a3c6385 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -7,7 +7,6 @@
* @requires jQueryUI
* @requires js/functions.js
*
- * @version $Id$
*/
/**
diff --git a/js/sql.js b/js/sql.js
index ee66044..126784d 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -5,7 +5,6 @@
* @requires jQuery
* @requires js/functions.js
*
- * @version $Id$
*/
/**
diff --git a/js/tbl_change.js b/js/tbl_change.js
index 3ef28cb..4a4e444 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -6,7 +6,6 @@
* @requires jQueryUI
* @requires js/functions.js
*
- * @version $Id$
*/
/**
diff --git a/js/tbl_operations.js b/js/tbl_operations.js
index c74cc60..6f5aa97 100644
--- a/js/tbl_operations.js
+++ b/js/tbl_operations.js
@@ -2,7 +2,6 @@
/**
* function used in server privilege pages
*
- * @version $Id$
*/
/**
diff --git a/js/update-location.js b/js/update-location.js
index b8b001d..d271cc8 100644
--- a/js/update-location.js
+++ b/js/update-location.js
@@ -3,7 +3,6 @@
* Scripts to update location to allow bookmarking of frameset
* and restoring the bookmark once the page is loaded.
*
- * @version $Id$
*/
var hash_to_set = "";
diff --git a/libraries/engines/pbms.lib.php b/libraries/engines/pbms.lib.php
index 2a51c92..58e3159 100644
--- a/libraries/engines/pbms.lib.php
+++ b/libraries/engines/pbms.lib.php
@@ -1,7 +1,6 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
- * @version $Id$
* @package phpMyAdmin-Engines
*/
diff --git a/libraries/import/README b/libraries/import/README
index 890a5da..6cb7d10 100644
--- a/libraries/import/README
+++ b/libraries/import/README
@@ -4,7 +4,6 @@ messages with their definition in language files, if you build some
plugins for your use, you can use directly texts in plugin.
<?php
-/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4 ft=php:
/* Demo import plugin for phpMyAdmin */
diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php
index aa5f43c..e58381e 100644
--- a/libraries/schema/Dia_Relation_Schema.class.php
+++ b/libraries/schema/Dia_Relation_Schema.class.php
@@ -2,7 +2,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
- * @version $Id$
* @package phpMyAdmin
*/
diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php
index fba0386..5435db4 100644
--- a/libraries/schema/Eps_Relation_Schema.class.php
+++ b/libraries/schema/Eps_Relation_Schema.class.php
@@ -2,7 +2,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
- * @version $Id$
* @package phpMyAdmin
*/
diff --git a/libraries/schema/Export_Relation_Schema.class.php b/libraries/schema/Export_Relation_Schema.class.php
index 87f80ba..78f11dd 100644
--- a/libraries/schema/Export_Relation_Schema.class.php
+++ b/libraries/schema/Export_Relation_Schema.class.php
@@ -2,7 +2,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
- * @version $Id$
* @package phpMyAdmin
*/
diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php
index f814750..7763701 100644
--- a/libraries/schema/Pdf_Relation_Schema.class.php
+++ b/libraries/schema/Pdf_Relation_Schema.class.php
@@ -2,7 +2,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
- * @version $Id$
* @package phpMyAdmin
*/
diff --git a/libraries/schema/Svg_Relation_Schema.class.php b/libraries/schema/Svg_Relation_Schema.class.php
index 76fd585..afafda7 100644
--- a/libraries/schema/Svg_Relation_Schema.class.php
+++ b/libraries/schema/Svg_Relation_Schema.class.php
@@ -2,7 +2,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
- * @version $Id$
* @package phpMyAdmin
*/
diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php
index 54ef5d4..36f9c36 100644
--- a/libraries/schema/User_Schema.class.php
+++ b/libraries/schema/User_Schema.class.php
@@ -2,7 +2,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
- * @version $Id$
* @package phpMyAdmin
*/
diff --git a/libraries/schema/Visio_Relation_Schema.class.php b/libraries/schema/Visio_Relation_Schema.class.php
index d4aaa2f..ab45b13 100644
--- a/libraries/schema/Visio_Relation_Schema.class.php
+++ b/libraries/schema/Visio_Relation_Schema.class.php
@@ -2,7 +2,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
- * @version $Id$
* @package phpMyAdmin
*/
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 7c8e8fa..793ae26 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -156,7 +156,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
{
global $SQP_errorString;
$debugstr = 'ERROR: ' . $message . "\n";
- $debugstr .= 'SVN: $Id$' . "\n";
$debugstr .= 'MySQL: '.PMA_MYSQL_STR_VERSION . "\n";
$debugstr .= 'USR OS, AGENT, VER: ' . PMA_USR_OS . ' ' . PMA_USR_BROWSER_AGENT . ' ' . PMA_USR_BROWSER_VER . "\n";
$debugstr .= 'PMA: ' . PMA_VERSION . "\n";
diff --git a/libraries/tcpdf/font/LICENSE b/libraries/tcpdf/font/LICENSE
index 56db9c0..7684811 100644
--- a/libraries/tcpdf/font/LICENSE
+++ b/libraries/tcpdf/font/LICENSE
@@ -94,5 +94,3 @@ be used in advertising or otherwise to promote the sale, use or other
dealings in this Font Software without prior written authorization
from Tavmjong Bah. For further information, contact: tavmjong @ free
. fr.
-
-$Id$
diff --git a/libraries/transformations/TEMPLATE b/libraries/transformations/TEMPLATE
index eabb194..50433d6 100644
--- a/libraries/transformations/TEMPLATE
+++ b/libraries/transformations/TEMPLATE
@@ -1,5 +1,4 @@
<?php
-/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:
/**
diff --git a/libraries/transformations/TEMPLATE_MIMETYPE b/libraries/transformations/TEMPLATE_MIMETYPE
index 75c7f7d..291eb60 100644
--- a/libraries/transformations/TEMPLATE_MIMETYPE
+++ b/libraries/transformations/TEMPLATE_MIMETYPE
@@ -1,5 +1,4 @@
<?php
-/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:
/**
diff --git a/libraries/transformations/generator.sh b/libraries/transformations/generator.sh
index aa4900e..034d0f0 100644
--- a/libraries/transformations/generator.sh
+++ b/libraries/transformations/generator.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-# $Id$
#
# Shell script that adds a new function file using a template. Should not be called directly
# but instead by template_Generator.sh and template_generator_mimetype.sh
diff --git a/libraries/transformations/template_generator.sh b/libraries/transformations/template_generator.sh
index 084559a..0b029e9 100644
--- a/libraries/transformations/template_generator.sh
+++ b/libraries/transformations/template_generator.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-# $Id$
#
# Shell script that adds a new mimetype with transform function.
#
diff --git a/libraries/transformations/template_generator_mimetype.sh b/libraries/transformations/template_generator_mimetype.sh
index edee55f..b93ee5d 100644
--- a/libraries/transformations/template_generator_mimetype.sh
+++ b/libraries/transformations/template_generator_mimetype.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-# $Id$
#
# Shell script that adds a new mimetype without transform function.
#
diff --git a/libraries/zip_extension.lib.php b/libraries/zip_extension.lib.php
index 14a2541..435d319 100644
--- a/libraries/zip_extension.lib.php
+++ b/libraries/zip_extension.lib.php
@@ -4,7 +4,6 @@
/**
* Interface for the zip extension
* @package phpMyAdmin
- * @version $Id$
*/
/**
diff --git a/pmd/scripts/ajax.js b/pmd/scripts/ajax.js
index 9a3ef3e..a26246d 100644
--- a/pmd/scripts/ajax.js
+++ b/pmd/scripts/ajax.js
@@ -1,7 +1,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
- * @version $Id$
* @package phpMyAdmin-Designer
*/
diff --git a/pmd/scripts/iecanvas.js b/pmd/scripts/iecanvas.js
index 3735029..5f304b5 100644
--- a/pmd/scripts/iecanvas.js
+++ b/pmd/scripts/iecanvas.js
@@ -1,7 +1,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
- * @version $Id$
* @package phpMyAdmin-Designer
*/
diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js
index a68f474..f07d806 100644
--- a/pmd/scripts/move.js
+++ b/pmd/scripts/move.js
@@ -1,6 +1,5 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
- * @version $Id$
* @package phpMyAdmin-Designer
*/
diff --git a/pmd/styles/default/style1.css b/pmd/styles/default/style1.css
index b4f7ec3..129c8d3 100644
--- a/pmd/styles/default/style1.css
+++ b/pmd/styles/default/style1.css
@@ -1,6 +1,5 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
- * @version $Id$
* @package phpMyAdmin-Designer
*/
body {
diff --git a/schema_edit.php b/schema_edit.php
index fb15d00..8494959 100644
--- a/schema_edit.php
+++ b/schema_edit.php
@@ -2,7 +2,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
- * @version $Id$
* @package phpMyAdmin
*/
diff --git a/schema_export.php b/schema_export.php
index 9f74fea..0a21d32 100644
--- a/schema_export.php
+++ b/schema_export.php
@@ -2,7 +2,6 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
*
- * @version $Id$
* @package phpMyAdmin
*/
diff --git a/scripts/convertcfg.pl b/scripts/convertcfg.pl
index 14c0709..69010fd 100755
--- a/scripts/convertcfg.pl
+++ b/scripts/convertcfg.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# $Id$
#
# Configuration converter
# Converts from old-style (Pre-2.3) configuration files to new format found in PMA-2.3
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index 4f327f6..88c008f 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $Id$
# vim: expandtab sw=4 ts=4 sts=4:
#
diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql
index ca7325a..1efdaad 100644
--- a/scripts/create_tables.sql
+++ b/scripts/create_tables.sql
@@ -11,7 +11,6 @@
--
-- Please don't forget to set up the tablenames in config.inc.php
--
--- $Id$
-- --------------------------------------------------------
diff --git a/scripts/lang-cleanup.sh b/scripts/lang-cleanup.sh
index b09674f..c783ca2 100755
--- a/scripts/lang-cleanup.sh
+++ b/scripts/lang-cleanup.sh
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $Id$
# vim: expandtab sw=4 ts=4 sts=4:
#
# Script for removing language selection from phpMyAdmin
diff --git a/scripts/remove_control_m.sh b/scripts/remove_control_m.sh
index 432c149..697b2d2 100755
--- a/scripts/remove_control_m.sh
+++ b/scripts/remove_control_m.sh
@@ -1,6 +1,5 @@
#!/bin/sh
#
-# $Id$
#
# Script to remove ^M from files for DOS <-> UNIX conversions
#
diff --git a/scripts/upgrade.pl b/scripts/upgrade.pl
index c9e625e..7f14294 100755
--- a/scripts/upgrade.pl
+++ b/scripts/upgrade.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# $Id$
#
# upgrade.pl - automatic phpmyadmin upgrader
#
diff --git a/scripts/upgrade_tables_mysql_4_1_2+.sql b/scripts/upgrade_tables_mysql_4_1_2+.sql
index 1ff470e..905bd68 100644
--- a/scripts/upgrade_tables_mysql_4_1_2+.sql
+++ b/scripts/upgrade_tables_mysql_4_1_2+.sql
@@ -10,7 +10,6 @@
--
-- Please don't forget to set up the tablenames in config.inc.php
--
--- $Id$
-- --------------------------------------------------------
diff --git a/tbl_chart.php b/tbl_chart.php
index 0e9ed40..f4b8bd3 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -3,7 +3,6 @@
/**
* handles creation of the chart
*
- * @version $Id$
* @package phpMyAdmin
*/
diff --git a/translators.html b/translators.html
index 2cf9227..537824c 100644
--- a/translators.html
+++ b/translators.html
@@ -2,7 +2,6 @@
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"
version="-//W3C//DTD XHTML 1.1//EN" dir="ltr">
-<!-- $Id$ -->
<!--
vim: expandtab ts=4 sw=4 sts=4 tw=78
-->
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list