summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorxue <>2006-09-13 12:37:23 +0000
committerxue <>2006-09-13 12:37:23 +0000
commit348fb25264f6cc9251f5ae9cb8c7a8a1013e2d67 (patch)
treeca03f23737bfdb09ab509a8b788277fc218400c2 /.gitattributes
parent3e76d1b8b3c71108f5a9ca1af5c9d40613546a90 (diff)
Merge from 3.0 branch till 1409.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 6875bd34..53b3e2b0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1837,6 +1837,7 @@ framework/Web/UI/WebControls/TListControl.php -text
framework/Web/UI/WebControls/TListControlValidator.php -text
framework/Web/UI/WebControls/TListItem.php -text
framework/Web/UI/WebControls/TLiteral.php -text
+framework/Web/UI/WebControls/TLiteralColumn.php -text
framework/Web/UI/WebControls/TMarkdown.php -text
framework/Web/UI/WebControls/TMultiView.php -text
framework/Web/UI/WebControls/TOutputCache.php -text