summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-05-01 11:19:20 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-05-01 11:19:20 -0700
commitec8dd014e3d10a05b57549cf4f0e82a630ef6303 (patch)
tree2fe1c6cabf7a38e01a7e5bc8605eb39b57b4f175 /.gitignore
parentaee641ee1e311fb0af0f9f6d75ca7fae2c7d8477 (diff)
parentb12e72ae312488caf7cb1e1a396eb05dd38326a9 (diff)
Merge branch '0.7.x' into querybyid
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 83a53dfa3..da6947bfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@ dataobject.ini
*.rej
.#*
*.swp
+.buildpath
+.project
+.settings