diff options
author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-05-01 17:03:51 +0000 |
---|---|---|
committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-05-01 17:03:51 +0000 |
commit | c8fd3c57655fd409312b9b959c284448f5aa41ae (patch) | |
tree | 7e4f97afe270bd44debb5760b101602f3f3b8a56 /.gitignore | |
parent | 10d42ce3920596ec6f36179e597dd3db257b8def (diff) | |
parent | deb07487bd0802fa6a89cfc8ddd56af93945eb4c (diff) |
Merge branch '0.7.x' into 0.8.x
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 |