From a27352010a0d0ae13b5beeac0132474e3ca6ac03 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Tue, 14 Oct 2008 19:00:43 +0000
Subject: Merge commit 'arthur/master'

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 015b351..d2e4fa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.project
+.settings
 *.csproj
 *.csproj.user
 *.build
@@ -24,4 +26,8 @@ OpenSim.build
 OpenSim.sln
 Prebuild/Prebuild.build
 Prebuild/Prebuild.sln
+bin/OpenSim.log
+bin/Physics*
+bin/Terrain*
+bin/estate_settings.xml
 *~
-- 
cgit v1.1