From 4945d1fb9856d92ab4dd9a0f65a11928f65f9b28 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 18 May 2006 18:12:39 +0000
Subject: Merge from 3.0 branch till 1079.

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

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index ac044898..0c224241 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -841,10 +841,12 @@ framework/I18N/schema/sqlite.sql -text
 framework/IO/TTarFileExtractor.php -text
 framework/IO/TTextWriter.php -text
 framework/PradoBase.php -text
+framework/Security/IUserManager.php -text
 framework/Security/TAuthManager.php -text
 framework/Security/TAuthorizationRule.php -text
 framework/Security/TMembershipManager.php -text
 framework/Security/TSecurityManager.php -text
+framework/Security/TUser.php -text
 framework/Security/TUserManager.php -text
 framework/TApplication.php -text
 framework/TApplicationComponent.php -text
-- 
cgit v1.2.3