From e4c9e8e311dc09424e4b865f53a0a6fe6872c4e6 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Mon, 23 Oct 2006 12:08:11 +0000
Subject: merge from 3.0 branch till 1475.

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.gitattributes')

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
-- 
cgit v1.2.3