Merge branch 'dev' of git://github.com/ceeram/infinitas into ceeram

infinitas · Jan 4, 2010 · c883d9e · c883d9e
2 parents f177e84 + 835ef6f
commit c883d9e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,7 @@ tmp/*
 libs/cronjobs
 *.LCK
 .gitignore
-infinitas.PHPEditProject
+infinitas.PHPEditProject
+.project
+.buildpath
+.settings/*