Merge remote-tracking branch 'os/master'

1 files changed, 113 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..94f896d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,113 @@
+.project
+.settings
+*.csproj
+*.csproj.user
+*.build
+*.mdb
+*.mdp
+*.mds
+*.pdb
+*.pidb
+*.dll.build
+*.dll
+
+# Ignore .user and .suo files as these are user preference specific
+# http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control
+*.suo
+*.user
+
+*.VisualState.xml
+*/*/obj
+*/*/*/obj
+*/*/*/*/obj
+*/*/*/*/*/obj
+*/*/*/*/*/*/obj
+*/*/*/*/*/*/*/obj
+*/*/bin
+*/*/*/bin
+*/*/*/*/bin
+*/*/*/*/*/bin
+*/*/*/*/*/*/bin
+*/*/*/*/*/*/*/bin
+bin/Debug/*.dll
+bin/*.dll.mdb
+bin/*.db
+bin/*.db-journal
+bin/addin-db-*
+bin/*.dll
+bin/OpenSim.vshost.exe.config
+bin/OpenSim.32BitLaunch.vshost.exe.config
+bin/OpenSim.32BitLaunch.log
+UpgradeLog.XML
+_UpgradeReport_Files/
+bin/ScriptEngines/*-*-*-*-*
+bin/ScriptEngines/*.dll
+bin/ScriptEngines/*/*.dll
+bin/ScriptEngines/*/*.state
+bin/*.maddin
+bin/*.exe
+bin/*.ini
+bin/j2kDecodeCache
+bin/Physics*
+bin/Terrain*
+bin/Regions/*
+bin/UserAssets
+bin/assetcache
+bin/maptiles
+bin/bakes
+bin/estate_settings.xml
+bin/config-include/CenomeCache.ini
+bin/config-include/FlotsamCache.ini
+bin/config-include/GridCommon.ini
+bin/config-include/StandaloneCommon.ini
+bin/OpenSim.Grid.AssetInventoryServer.log
+bin/OpenSim.Grid.AssetServer.log
+bin/OpenSim.Grid.GridServer.log
+bin/OpenSim.Grid.InventoryServer.log
+bin/OpenSim.Grid.MessagingServer.log
+bin/OpenSim.Grid.UserServer.log
+bin/OpenSim.log
+bin/OpenSimStats.log
+bin/Robust.log
+bin/RobustStats.log
+bin/OpenSimConsoleHistory.txt
+bin/RobustConsoleHistory.txt
+bin/*.Tests.log
+bin/*.manifest
+bin/crashes/
+Examples/*.dll
+OpenSim.build
+OpenSim.sln
+OpenSim.userprefs
+Prebuild/Prebuild.build
+Prebuild/Prebuild.sln
+TestResult.xml
+cov/*
+OpenSim/OpenSim.userprefs
+OpenSim/OpenSim.usertasks
+TAGS
+*~
+Makefile.local
+bin/.version
+compile.bat
+addon-modules
+OpenSim/Data/Tests/test-results/
+OpenSim/Framework/Serialization/Tests/test-results/
+OpenSim/Framework/Servers/Tests/test-results/
+OpenSim/Framework/Tests/test-results/
+OpenSim/Region/ClientStack/Linden/Caps/test-results/
+OpenSim/Region/ClientStack/Linden/UDP/Tests/test-results/
+OpenSim/Region/CoreModules/test-results/
+OpenSim/Region/Framework/test-results/
+OpenSim/Region/OptionalModules/test-results/
+OpenSim/Region/Physics/BulletDotNETPlugin/
+OpenSim/Region/Physics/Manager/test-results/
+OpenSim/Region/Physics/OdePlugin/Tests/test-results/
+OpenSim/Region/ScriptEngine/test-results/
+OpenSim/Tests/Common/test-results/
+OpenSim/Tests/test-results/
+test-results/
+doc/html
+doc/doxygen.error.log
+
+*.patch