diff options
| author | xue <> | 2006-10-23 12:08:11 +0000 |
|---|---|---|
| committer | xue <> | 2006-10-23 12:08:11 +0000 |
| commit | e4c9e8e311dc09424e4b865f53a0a6fe6872c4e6 (patch) | |
| tree | 094321633b3d900a83dd1b01864fb9010173a72c /.gitattributes | |
| parent | 5dd2b03677b8937f704cc263bf78d6174a0fe00e (diff) | |
merge from 3.0 branch till 1475.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index ec117929..592c9f95 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1769,6 +1769,7 @@ framework/Web/Javascripts/extra/logger.js -text framework/Web/Javascripts/js/compressed/ajax.js -text framework/Web/Javascripts/js/compressed/clientscripts.php -text framework/Web/Javascripts/js/compressed/colorpicker.js -text +framework/Web/Javascripts/js/compressed/containers.js -text framework/Web/Javascripts/js/compressed/datepicker.js -text framework/Web/Javascripts/js/compressed/effects.js -text framework/Web/Javascripts/js/compressed/logger.js -text @@ -1778,6 +1779,7 @@ framework/Web/Javascripts/js/compressed/validator.js -text framework/Web/Javascripts/js/debug/ajax.js -text framework/Web/Javascripts/js/debug/clientscripts.php -text framework/Web/Javascripts/js/debug/colorpicker.js -text +framework/Web/Javascripts/js/debug/containers.js -text framework/Web/Javascripts/js/debug/datepicker.js -text framework/Web/Javascripts/js/debug/effects.js -text framework/Web/Javascripts/js/debug/logger.js -text |