From 112d86bb08a1dd4bde14005f757c95b0fc7a5a21 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 4 Jun 2006 20:51:27 +0000
Subject: Merge from 3.0 branch till 1140.

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index a18d9820..79cb8dfd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,6 +4,7 @@
 /UPGRADE -text
 /build.xml -text
 buildscripts/.htaccess -text
+buildscripts/classtree/build.php -text
 buildscripts/index/api_index.php -text
 buildscripts/index/build.php -text
 buildscripts/index/quickstart_index.php -text
@@ -1107,6 +1108,7 @@ framework/Web/UI/WebControls/TTableRow.php -text
 framework/Web/UI/WebControls/TTemplateColumn.php -text
 framework/Web/UI/WebControls/TTextBox.php -text
 framework/Web/UI/WebControls/TTextHighlighter.php -text
+framework/Web/UI/WebControls/TTextProcessor.php -text
 framework/Web/UI/WebControls/TValidationSummary.php -text
 framework/Web/UI/WebControls/TWebControl.php -text
 framework/Web/UI/WebControls/TWebControlAdapter.php -text
-- 
cgit v1.2.3