diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-05-25 22:47:23 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-05-25 22:47:23 -0400 |
| commit | 76aa85fe5ef408cecf7c40c0c56d58ff9ac9fcbb (patch) | |
| tree | f2bd52d08e421f934bc8466ab1ecb4facbbcc6a5 /.gitignore | |
| parent | b140bcdee4b1f4c8f2f34a89a9c5c51e7ecfe826 (diff) | |
| parent | 68d90bcab04713d53cf3731d45729a617e68a2fa (diff) | |
Merge branch '0.8.x' into stats
Conflicts:
README
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 |