From 47a3cb88e7ed7f2a87bbf024dff3416fc6cd8002 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 31 Aug 2006 20:17:39 +0000
Subject: merge from 3.0 branch till 1374.

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index b158779a..2606fb46 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1800,6 +1800,7 @@ framework/Web/UI/WebControls/TDataSourceView.php -text
 framework/Web/UI/WebControls/TDataTypeValidator.php -text
 framework/Web/UI/WebControls/TDatePicker.php -text
 framework/Web/UI/WebControls/TDropDownList.php -text
+framework/Web/UI/WebControls/TDropDownListColumn.php -text
 framework/Web/UI/WebControls/TEditCommandColumn.php -text
 framework/Web/UI/WebControls/TEmailAddressValidator.php -text
 framework/Web/UI/WebControls/TExpression.php -text
-- 
cgit v1.2.3