summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorxue <>2006-07-02 18:05:42 +0000
committerxue <>2006-07-02 18:05:42 +0000
commit7e002c23edc5fb5db70935591aa6adeda25fc7fb (patch)
tree846feb337405448cc1559c2e7b4ed6f85798e0c7 /.gitattributes
parent618293517861b69334cd470068199394120cd20a (diff)
Merge from 3.0 branch till 1224.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes5
1 files changed, 1 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes
index 04b42000..ea016ff1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -696,10 +696,6 @@ demos/quickstart/index.php -text
demos/quickstart/index2.php -text
demos/quickstart/protected/.htaccess -text
demos/quickstart/protected/application.xml -text
-demos/quickstart/protected/comments/CommentList.php -text
-demos/quickstart/protected/comments/CommentList.tpl -text
-demos/quickstart/protected/comments/QuickStartComments.php -text
-demos/quickstart/protected/comments/comments.db -text
demos/quickstart/protected/controls/DocLink.php -text
demos/quickstart/protected/controls/Layout.php -text
demos/quickstart/protected/controls/Layout.tpl -text
@@ -1500,6 +1496,7 @@ framework/Web/Javascripts/colorpicker/colorpicker.js -text
framework/Web/Javascripts/colorpicker/default.css -text
framework/Web/Javascripts/colorpicker/hue.gif -text
framework/Web/Javascripts/colorpicker/slider.gif -text
+framework/Web/Javascripts/colorpicker/spacer.gif -text
framework/Web/Javascripts/colorpicker/target_black.gif -text
framework/Web/Javascripts/colorpicker/target_white.gif -text
framework/Web/Javascripts/datepicker/calendar.png -text