From aac749d4fbfdf3508d97f7dfe4d7c2c03597edbb Mon Sep 17 00:00:00 2001
From: xue <>
Date: Mon, 26 Jun 2006 02:52:44 +0000
Subject: Merge from 3.0 branch till 1202.

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

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index 15501094..3c3ac2f0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1650,7 +1650,9 @@ framework/Web/UI/WebControls/TLiteral.php -text
 framework/Web/UI/WebControls/TMarkdown.php -text
 framework/Web/UI/WebControls/TMultiView.php -text
 framework/Web/UI/WebControls/TOutputCache.php -text
+framework/Web/UI/WebControls/TPager.php -text
 framework/Web/UI/WebControls/TPanel.php -text
+framework/Web/UI/WebControls/TPanelStyle.php -text
 framework/Web/UI/WebControls/TPlaceHolder.php -text
 framework/Web/UI/WebControls/TRadioButton.php -text
 framework/Web/UI/WebControls/TRadioButtonList.php -text
-- 
cgit v1.2.3