summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorxue <>2006-06-26 02:52:44 +0000
committerxue <>2006-06-26 02:52:44 +0000
commitaac749d4fbfdf3508d97f7dfe4d7c2c03597edbb (patch)
tree54895dbe8d89f9572108f0bc5bdf07160c166e0f /.gitattributes
parent7e5dd26cd604318cf4b6d624e8080c801bfb38d0 (diff)
Merge from 3.0 branch till 1202.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes2
1 files changed, 2 insertions, 0 deletions
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