diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-27 14:52:35 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-27 14:52:35 -0400 |
commit | b3bb8943f592de9f6936f35be49a88c641bf6da1 (patch) | |
tree | befbe8ff6d3c7d1268ecce3696bee5caaa799db7 /.gitignore | |
parent | 698228acb9a6262f2fb4e0c82118249aa94cc0f8 (diff) | |
parent | f59ab5dc40862b141ee5463fd4d24b0d213a96f2 (diff) |
Merge branch '0.7.x' into utf8
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
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 |