From bf8caefce718cc38ccfd121d9cd718f42021b2b9 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 2 Dec 2006 19:27:15 +0000
Subject: merge from 3.0 branch till 1540.

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index 665367a7..751393fa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1922,6 +1922,7 @@ framework/Web/THttpRequest.php -text
 framework/Web/THttpResponse.php -text
 framework/Web/THttpSession.php -text
 framework/Web/THttpUtility.php -text
+framework/Web/TUrlManager.php -text
 framework/Web/TUrlMapping.php -text
 framework/Web/UI/ActiveControls/TActiveButton.php -text
 framework/Web/UI/ActiveControls/TActiveControlAdapter.php -text
-- 
cgit v1.2.3