diff options
| author | ctrlaltca@gmail.com <> | 2011-05-21 18:14:36 +0000 |
|---|---|---|
| committer | ctrlaltca@gmail.com <> | 2011-05-21 18:14:36 +0000 |
| commit | 0892b27e326f14bd3f6229b55077ef5f9d5280b4 (patch) | |
| tree | 24039ec47ba8977bf14ba435c058e758e901f185 /.gitattributes | |
| parent | 6f00b28a1d9c7409c956a83866eac48a9493e83c (diff) | |
branch/3.1: merged bugfixes from trunk/ up to current
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/.gitattributes b/.gitattributes index f31bb494..f8c1d508 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2529,7 +2529,7 @@ framework/Web/Javascripts/source/prado/activecontrols/activedatepicker.js -text framework/Web/Javascripts/source/prado/activecontrols/ajax3.js -text framework/Web/Javascripts/source/prado/activecontrols/dragdrop.js -text framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js -text -framework/Web/Javascripts/source/prado/activecontrols/json.js -text +framework/Web/Javascripts/source/prado/activecontrols/json2.js -text framework/Web/Javascripts/source/prado/activefileupload/ActiveFileUploadBlank.html -text framework/Web/Javascripts/source/prado/activefileupload/ActiveFileUploadComplete.png -text svneol=unset#image/png framework/Web/Javascripts/source/prado/activefileupload/ActiveFileUploadError.png -text svneol=unset#image/png @@ -2569,16 +2569,16 @@ framework/Web/Javascripts/source/prado/ratings/ratings.js -text framework/Web/Javascripts/source/prado/ratings/stars1.png -text framework/Web/Javascripts/source/prado/scriptaculous-adapter.js -text framework/Web/Javascripts/source/prado/validator/validation3.js -text -framework/Web/Javascripts/source/prototype-1.6.0.3/prototype.js -text -framework/Web/Javascripts/source/scriptaculous-1.8.2/CHANGELOG -text -framework/Web/Javascripts/source/scriptaculous-1.8.2/MIT-LICENSE -text -framework/Web/Javascripts/source/scriptaculous-1.8.2/builder.js -text -framework/Web/Javascripts/source/scriptaculous-1.8.2/controls.js -text -framework/Web/Javascripts/source/scriptaculous-1.8.2/dragdrop.js -text -framework/Web/Javascripts/source/scriptaculous-1.8.2/effects.js -text -framework/Web/Javascripts/source/scriptaculous-1.8.2/scriptaculous.js -text -framework/Web/Javascripts/source/scriptaculous-1.8.2/slider.js -text -framework/Web/Javascripts/source/scriptaculous-1.8.2/sound.js -text +framework/Web/Javascripts/source/prototype-1.7/prototype.js -text +framework/Web/Javascripts/source/scriptaculous-1.9.0/CHANGELOG -text +framework/Web/Javascripts/source/scriptaculous-1.9.0/MIT-LICENSE -text +framework/Web/Javascripts/source/scriptaculous-1.9.0/builder.js -text +framework/Web/Javascripts/source/scriptaculous-1.9.0/controls.js -text +framework/Web/Javascripts/source/scriptaculous-1.9.0/dragdrop.js -text +framework/Web/Javascripts/source/scriptaculous-1.9.0/effects.js -text +framework/Web/Javascripts/source/scriptaculous-1.9.0/scriptaculous.js -text +framework/Web/Javascripts/source/scriptaculous-1.9.0/slider.js -text +framework/Web/Javascripts/source/scriptaculous-1.9.0/sound.js -text framework/Web/Services/TFeedService.php -text framework/Web/Services/TJsonService.php -text framework/Web/Services/TPageService.php -text |