From d860219f366a8fbe63b03d26c69525d4e6bd4f3a Mon Sep 17 00:00:00 2001 From: "Christophe.Boulain" <> Date: Mon, 15 Feb 2010 09:20:35 +0000 Subject: Merge from r2765 (and some others) 3.1 Added TActiveTableRow QST page Corrected an uninitialized array in TScaffoldBase --- .gitattributes | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.gitattributes') 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 -- cgit v1.2.3