diff options
| author | ctrlaltca@gmail.com <> | 2011-06-02 09:56:29 +0000 |
|---|---|---|
| committer | ctrlaltca@gmail.com <> | 2011-06-02 09:56:29 +0000 |
| commit | b9f9a16d7eefc48ac489c8cb2b87749459bb3d38 (patch) | |
| tree | 2cec49f90dd8cd2071bd86efa9c2a6e8a6dfcbe4 /.gitattributes | |
| parent | 67666aaccb4b4743a084b214722e1173e827e9d1 (diff) | |
merged documentation changes from branch/3.1 to trunk/
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/.gitattributes b/.gitattributes index 0d0b1761..122e33ea 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1289,6 +1289,8 @@ demos/quickstart/protected/index/quickstart/segments -text demos/quickstart/protected/pages/ActiveControls/ActiveButton.page -text demos/quickstart/protected/pages/ActiveControls/ActiveCheckBox.page -text demos/quickstart/protected/pages/ActiveControls/ActiveCustomValidator.page -text +demos/quickstart/protected/pages/ActiveControls/ActiveDataGrid.page -text +demos/quickstart/protected/pages/ActiveControls/ActiveDataList.page -text demos/quickstart/protected/pages/ActiveControls/ActiveHyperLink.page -text demos/quickstart/protected/pages/ActiveControls/ActiveImage.page -text demos/quickstart/protected/pages/ActiveControls/ActiveImageButton.page -text @@ -1298,6 +1300,7 @@ demos/quickstart/protected/pages/ActiveControls/ActiveMultiView.page -text demos/quickstart/protected/pages/ActiveControls/ActivePager.page -text demos/quickstart/protected/pages/ActiveControls/ActivePanel.page -text demos/quickstart/protected/pages/ActiveControls/ActiveRadioButton.page -text +demos/quickstart/protected/pages/ActiveControls/ActiveRepeater.page -text demos/quickstart/protected/pages/ActiveControls/ActiveTextBox.page -text demos/quickstart/protected/pages/ActiveControls/AutoComplete.page -text demos/quickstart/protected/pages/ActiveControls/DragDrop.page -text @@ -1323,8 +1326,8 @@ demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample4. demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample4.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample5.page -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample5.php -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample6.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataGrid/Sample6.php -text +demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataList/Home.page -text +demos/quickstart/protected/pages/ActiveControls/Samples/TActiveDataList/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveHyperLink/Home.page -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveHyperLink/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveHyperLink/hello_world.gif -text @@ -1347,18 +1350,8 @@ demos/quickstart/protected/pages/ActiveControls/Samples/TActivePanel/Home.page - demos/quickstart/protected/pages/ActiveControls/Samples/TActivePanel/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRadioButton/Home.page -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRadioButton/Home.php -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/RegionDisplay.php -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/RegionDisplay.tpl -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample1.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample1.php -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample2.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample2.php -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample3.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample3.php -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample4.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample4.php -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample5.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample5.php -text +demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Home.page -text +demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveTableRow/Home.page -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveTableRow/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveTextBox/Home.page -text |