diff options
author | xue <> | 2006-06-04 20:51:27 +0000 |
---|---|---|
committer | xue <> | 2006-06-04 20:51:27 +0000 |
commit | 112d86bb08a1dd4bde14005f757c95b0fc7a5a21 (patch) | |
tree | 61b601c9516944b58dd0025bb74829be8186f1e5 /.gitattributes | |
parent | 0f3a577bed4d828472469675e90fcab032e33f44 (diff) |
Merge from 3.0 branch till 1140.
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
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 |