diff .gitignore @ 511:107d36338b70 live

Merge from branch "cannam"

--- a/.gitignore	Thu Jun 09 16:51:06 2011 +0100
+++ b/.gitignore	Thu Jul 14 10:43:07 2011 +0100
@@ -1,4 +1,7 @@
+/.project
+/.loadpath
 /config/additional_environment.rb
+/config/configuration.yml
 /config/database.yml
 /config/email.yml
 /config/initializers/session_store.rb
@@ -7,6 +10,8 @@
 /db/*.sqlite3
 /db/schema.rb
 /files/*
+/lib/redmine/scm/adapters/mercurial/redminehelper.pyc
+/lib/redmine/scm/adapters/mercurial/redminehelper.pyo
 /log/*.log*
 /log/mongrel_debug
 /public/dispatch.*