From 90b3f22cba8ad85ef2eb38c158fa2da46d798cf8 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 8 Sep 2006 19:31:03 +0000
Subject: merge from 3.0 branch till 1397.

---
 framework/3rdParty/geshi/docs/README | 2 +-
 framework/3rdParty/geshi/docs/THANKS | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework/3rdParty/geshi/docs')

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$
-- 
cgit v1.2.3