diff options
| author | xue <> | 2006-05-04 20:00:46 +0000 |
|---|---|---|
| committer | xue <> | 2006-05-04 20:00:46 +0000 |
| commit | 42df6f47862c2f1495ded49f758dbc46f9d9e930 (patch) | |
| tree | ee849b9758bcbd5c1b1aac40761ce68417eba2bb /.gitattributes | |
| parent | c00193d23726bcb05b1fe53c4dfb3fc38b0a22e5 (diff) | |
Merge from 3.0 branch till 1023.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index b9a4e3b3..88be958c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -934,6 +934,7 @@ framework/Web/UI/ActiveControls/TCallbackClientScript.php -text framework/Web/UI/ActiveControls/TCallbackClientSideOptions.php -text framework/Web/UI/ActiveControls/TCallbackResponse.php -text framework/Web/UI/TClientScriptManager.php -text +framework/Web/UI/TCompositeControl.php -text framework/Web/UI/TControl.php -text framework/Web/UI/TControlAdapter.php -text framework/Web/UI/TForm.php -text @@ -1006,7 +1007,9 @@ framework/Web/UI/WebControls/TStatements.php -text framework/Web/UI/WebControls/TStyle.php -text framework/Web/UI/WebControls/TTable.php -text framework/Web/UI/WebControls/TTableCell.php -text +framework/Web/UI/WebControls/TTableFooterRow.php -text framework/Web/UI/WebControls/TTableHeaderCell.php -text +framework/Web/UI/WebControls/TTableHeaderRow.php -text framework/Web/UI/WebControls/TTableRow.php -text framework/Web/UI/WebControls/TTemplateColumn.php -text framework/Web/UI/WebControls/TTextBox.php -text |