merge from 3.0 branch till 1397.

7 files changed, 9 insertions, 9 deletions

diff --git a/framework/3rdParty/SafeHtml/HTMLSax3.php b/framework/3rdParty/SafeHtml/HTMLSax3.php
index 35e50f55..1be7aede 100644
--- a/framework/3rdParty/SafeHtml/HTMLSax3.php
+++ b/framework/3rdParty/SafeHtml/HTMLSax3.php
@@ -19,12 +19,12 @@
 // | Authors: Many @ Sitepointforums Advanced PHP Forums                  |

 // +----------------------------------------------------------------------+

 //

-// $Id: HTMLSax3.php,v 1.2 2005/12/22 11:09:09 weizhuo Exp $

+// $Id$

 //

 /**

 * Main parser components

 * @package    System.Security.SafeHtml

-* @version $Id: HTMLSax3.php,v 1.2 2005/12/22 11:09:09 weizhuo Exp $

+* @version $Id$

 */

 /**

 * Required classes

diff --git a/framework/3rdParty/SafeHtml/HTMLSax3/Decorators.php b/framework/3rdParty/SafeHtml/HTMLSax3/Decorators.php
index 6256706c..ac82d073 100644
--- a/framework/3rdParty/SafeHtml/HTMLSax3/Decorators.php
+++ b/framework/3rdParty/SafeHtml/HTMLSax3/Decorators.php
@@ -19,12 +19,12 @@
 // | Authors: Many @ Sitepointforums Advanced PHP Forums                  |

 // +----------------------------------------------------------------------+

 //

-// $Id: Decorators.php,v 1.2 2005/12/22 11:09:09 weizhuo Exp $

+// $Id$

 //

 /**

 * Decorators for dealing with parser options

 * @package System.Security.SafeHtml

-* @version $Id: Decorators.php,v 1.2 2005/12/22 11:09:09 weizhuo Exp $

+* @version $Id$

 * @see TSax3::set_option

 */

 /**

diff --git a/framework/3rdParty/SafeHtml/HTMLSax3/States.php b/framework/3rdParty/SafeHtml/HTMLSax3/States.php
index 2b863a59..6dfead17 100644
--- a/framework/3rdParty/SafeHtml/HTMLSax3/States.php
+++ b/framework/3rdParty/SafeHtml/HTMLSax3/States.php
@@ -19,12 +19,12 @@
 // | Authors: Many @ Sitepointforums Advanced PHP Forums                  |

 // +----------------------------------------------------------------------+

 //

-// $Id: States.php,v 1.2 2005/12/22 11:09:09 weizhuo Exp $

+// $Id$

 //

 /**

 * Parsing states.

 * @package System.Security.SafeHtml

-* @version $Id: States.php,v 1.2 2005/12/22 11:09:09 weizhuo Exp $

+* @version $Id$

 */

 /**

 * Define parser states

diff --git a/framework/3rdParty/TinyMCE/tiny_mce.tar b/framework/3rdParty/TinyMCE/tiny_mce.tar
index 125ee624..ee8a5603 100644
--- a/framework/3rdParty/TinyMCE/tiny_mce.tar
+++ b/framework/3rdParty/TinyMCE/tiny_mce.tar
diff --git a/framework/3rdParty/geshi/docs/README b/framework/3rdParty/geshi/docs/README
index 11857d5d..9a67fdf1 100644
--- a/framework/3rdParty/geshi/docs/README
+++ b/framework/3rdParty/geshi/docs/README
@@ -32,4 +32,4 @@ COPYING file for more information. If you do modify this program,
 please tell me about it! Perhaps you've made a good improvement that
 I can learn from :)
 
-     $Id: README,v 1.6 2005/10/22 07:52:59 oracleshinoda Exp $
+     $Id$
diff --git a/framework/3rdParty/geshi/docs/THANKS b/framework/3rdParty/geshi/docs/THANKS
index 540efbbe..2b2e5d99 100644
--- a/framework/3rdParty/geshi/docs/THANKS
+++ b/framework/3rdParty/geshi/docs/THANKS
@@ -84,4 +84,4 @@ PEOPE WHO MADE LANGUAGE FILES
 Do you want your name in here? Help me out! Make a language file, or suggest a new
 feature, or make a plugin for GeSHi for some other software, then tell me about it!
 
-              $Id: THANKS,v 1.7 2005/11/19 01:02:50 oracleshinoda Exp $
+              $Id$
diff --git a/framework/3rdParty/geshi/geshi.php b/framework/3rdParty/geshi/geshi.php
index b124c936..983a42a0 100644
--- a/framework/3rdParty/geshi/geshi.php
+++ b/framework/3rdParty/geshi/geshi.php
@@ -28,7 +28,7 @@
  * @author    Nigel McNie <nigel@geshi.org>
  * @copyright Copyright &copy; 2004, 2005, Nigel McNie
  * @license   http://gnu.org/copyleft/gpl.html GNU GPL
- * @version   $Id: geshi.php,v 1.23 2005/11/19 02:23:37 oracleshinoda Exp $
+ * @version   $Id$
  *
  */