diff options
| author | Christophe.Boulain <> | 2009-06-02 08:16:54 +0000 |
|---|---|---|
| committer | Christophe.Boulain <> | 2009-06-02 08:16:54 +0000 |
| commit | 0847a5cb9bc02872e472622e1eec56896a412078 (patch) | |
| tree | 0f43a88df53333f01e06e1f214c31a77f412e1c0 /.gitattributes | |
| parent | 0ce86cec9911151088341846dd2677bfed2ff51e (diff) | |
| parent | 8e0cb0ff0a89603740c7a46a43c87a6d3267ca6f (diff) | |
Merging latest 3.1 changes into trunk
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes index b83488ab..1ba435cd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1296,9 +1296,9 @@ demos/quickstart/protected/pages/ActiveControls/DragDrop.page -text demos/quickstart/protected/pages/ActiveControls/Home.page -text demos/quickstart/protected/pages/ActiveControls/Introduction.page -text demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png -text svneol=unset#image/png -demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png -text svneol=unset#image/png -demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png -text svneol=unset#image/png +demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png -text svneol=unset#image/png +demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png -text svneol=unset#image/png +demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png -text svneol=unset#image/png demos/quickstart/protected/pages/ActiveControls/Samples/TActiveButton/Home.page -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveButton/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveCheckBox/Home.page -text |