diff options
| author | ctrlaltca@gmail.com <> | 2011-05-21 17:10:29 +0000 |
|---|---|---|
| committer | ctrlaltca@gmail.com <> | 2011-05-21 17:10:29 +0000 |
| commit | 6f00b28a1d9c7409c956a83866eac48a9493e83c (patch) | |
| tree | fb3e14f0a527cf32d186932b13bd6ae9ed50a5c1 /.gitattributes | |
| parent | 5a91b2a3328c8c15ce9dbed9a599ab87f9e8f112 (diff) | |
branch/3.1: merged bugfixesfrom trunk/ up to r2880; correct svn:mergeinfo property
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 772a2b7d..f31bb494 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2086,6 +2086,7 @@ framework/Caching/TXCache.php -text framework/Collections/TAttributeCollection.php -text framework/Collections/TDummyDataSource.php -text framework/Collections/TList.php -text +framework/Collections/TListItemCollection.php -text framework/Collections/TMap.php -text framework/Collections/TPagedDataSource.php -text framework/Collections/TPagedList.php -text |