From 30c3077ed53421e0cb0d43c6a6c4d604d4077aeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 22 Feb 2006 17:58:19 +0000
Subject: [PATCH] Do not ignore .htaccess.

---
 .cvsignore | 1 -
 ChangeLog  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cvsignore b/.cvsignore
index c5dacdf7f..a71b981a7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,7 +5,6 @@ phpmyadmin.wpj
 *.swp
 upload
 save
-.htaccess
 .vimrc
 .project
 .settings
diff --git a/ChangeLog b/ChangeLog
index dd740d0c0..4064b58c2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,7 @@ $Source$
       libraries/dbi/mysql.dbi.lib.php, libraries/dbi/mysqli.dbi.lib.php: Allow
       to use external authentication and use empty MySQL passwords (path
       #1388210, thanks to Patrick MONNERAT - monnerat).
+    * .cvsignore: Do not ignore .htaccess.
 
 2006-02-22 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/footer.inc.php: