diff options
| author | xue <> | 2006-05-30 03:30:14 +0000 |
|---|---|---|
| committer | xue <> | 2006-05-30 03:30:14 +0000 |
| commit | 75f28186a995aa930f6db9f05ec7b63bbd2cd284 (patch) | |
| tree | 9621a9db8c69daf951f87fb57996428d57d710a6 /.gitattributes | |
| parent | 2ea02214b2fb6bedb58dbbd318ef171a9e146524 (diff) | |
Merge from 3.0 branch till 1103
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/.gitattributes b/.gitattributes index 6b709dfd..d046e8ab 100644 --- a/.gitattributes +++ b/.gitattributes @@ -26,7 +26,7 @@ buildscripts/texbuilder/pages.php -text buildscripts/texbuilder/prado3_quick_start.tex -text demos/blog/index.php -text demos/blog/protected/Common/BlogDataModule.php -text -demos/blog/protected/Common/BlogErrors.php -text +demos/blog/protected/Common/BlogErrorHandler.php -text demos/blog/protected/Common/BlogException.php -text demos/blog/protected/Common/BlogPage.php -text demos/blog/protected/Common/BlogUser.php -text @@ -34,7 +34,7 @@ demos/blog/protected/Common/BlogUserManager.php -text demos/blog/protected/Common/XListMenu.php -text demos/blog/protected/Common/messages.txt -text demos/blog/protected/Common/schema.sql -text -demos/blog/protected/Data/Options.xml -text +demos/blog/protected/Data/Settings.xml -text demos/blog/protected/Layouts/MainLayout.php -text demos/blog/protected/Layouts/MainLayout.tpl -text demos/blog/protected/Pages/Admin/AdminMenu.php -text @@ -43,7 +43,6 @@ demos/blog/protected/Pages/Admin/ConfigMan.page -text demos/blog/protected/Pages/Admin/ConfigMan.php -text demos/blog/protected/Pages/Admin/PostMan.page -text demos/blog/protected/Pages/Admin/PostMan.php -text -demos/blog/protected/Pages/Admin/Settings.page -text demos/blog/protected/Pages/Admin/UserMan.page -text demos/blog/protected/Pages/Admin/UserMan.php -text demos/blog/protected/Pages/Admin/config.xml -text @@ -64,6 +63,8 @@ demos/blog/protected/Pages/Posts/NewPost.php -text demos/blog/protected/Pages/Posts/ViewPost.page -text demos/blog/protected/Pages/Posts/ViewPost.php -text demos/blog/protected/Pages/Posts/config.xml -text +demos/blog/protected/Pages/SearchPost.page -text +demos/blog/protected/Pages/SearchPost.php -text demos/blog/protected/Pages/Users/EditUser.page -text demos/blog/protected/Pages/Users/EditUser.php -text demos/blog/protected/Pages/Users/NewUser.page -text @@ -83,8 +84,10 @@ demos/blog/protected/Portlets/Portlet.php -text demos/blog/protected/Portlets/SearchPortlet.php -text demos/blog/protected/Portlets/SearchPortlet.tpl -text demos/blog/protected/application.xml -text -demos/blog/sitemap.txt -text -demos/blog/themes/Basic/style.css -text +demos/blog/themes/Fall/style.css -text +demos/blog/themes/Spring/style.css -text +demos/blog/themes/Summer/style.css -text +demos/blog/themes/Winter/style.css -text demos/composer/index.php -text demos/composer/index2.php -text demos/composer/protected/pages/ClassDefinition.php -text |