diff .hgignore @ 912:5e80956cc792 cannam_integration

Merge from branch "redmine-1.3"
author Chris Cannam
date Mon, 27 Feb 2012 13:53:18 +0000
parents a8e5a47c5596 cbb26bc654de
children 8196ed891e54 be5cf488993e
line wrap: on
line diff
--- a/.hgignore	Fri Feb 24 20:18:25 2012 +0000
+++ b/.hgignore	Mon Feb 27 13:53:18 2012 +0000
@@ -18,13 +18,20 @@
 log/mongrel_debug
 public/dispatch.*
 public/plugin_assets
+tmp/*
 tmp/cache/*
 tmp/sessions/*
 tmp/sockets/*
 tmp/test/*
 vendor/rails
 *.rbc
+
 .svn/
 .git/
 *~
 
+
+.bundle
+Gemfile.lock
+Gemfile.local
+