diff options
| author | Christophe.Boulain <> | 2010-02-15 09:20:35 +0000 |
|---|---|---|
| committer | Christophe.Boulain <> | 2010-02-15 09:20:35 +0000 |
| commit | d860219f366a8fbe63b03d26c69525d4e6bd4f3a (patch) | |
| tree | 6520a9a0a70a941d122de10d8f5ae9e3883a0ac6 /.gitattributes | |
| parent | 94e94e0a8566f23d16658a04c55b0bbfdd6689aa (diff) | |
Merge from r2765 (and some others) 3.1
Added TActiveTableRow QST page
Corrected an uninitialized array in TScaffoldBase
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 964ffa6d..9de5ae6c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1333,6 +1333,8 @@ demos/quickstart/protected/pages/ActiveControls/Samples/TActiveRepeater/Sample4. 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/TActiveTableRow/Home.page -text +demos/quickstart/protected/pages/ActiveControls/Samples/TActiveTableRow/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TAutoComplete/Home.page -text demos/quickstart/protected/pages/ActiveControls/Samples/TAutoComplete/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/config.xml -text @@ -3012,6 +3014,8 @@ tests/FunctionalTests/active-controls/protected/pages/ReplaceContentTest.php -te tests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.page -text tests/FunctionalTests/active-controls/protected/pages/Sessioned/PageStateTest.php -text tests/FunctionalTests/active-controls/protected/pages/Sessioned/config.xml -text +tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page -text +tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.php -text tests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.page -text tests/FunctionalTests/active-controls/protected/pages/TInPlaceTextBoxTest.php -text tests/FunctionalTests/active-controls/protected/pages/TestMasterPage.php -text |