Melanie 3a495ccd56 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs		2013-01-10 01:38:03 +00:00
..
Library	…
Physics	…
Regions	…
addon-modules	…
assets	…
config-include	…
data	…
inventory	…
lib32	Merge branch 'master' into careminster	2013-01-10 01:38:03 +00:00
lib64	Merge branch 'master' into careminster	2013-01-10 01:38:03 +00:00
openmetaverse_data	…
Axiom.MathLib.dll	…
BulletXNA.dll	…
BulletXNA.pdb	…
C5.dll	…
CSJ2K.dll	…
Community.CsharpSqlite.Sqlite.dll	…
Community.CsharpSqlite.Sqlite.pdb	…
Community.CsharpSqlite.dll	…
Community.CsharpSqlite.pdb	…
CookComputing.XmlRpcV2.dll	…
DotNetOpenId.dll	…
DotNetOpenMail.dll	…
GlynnTucker.Cache.dll	…
HttpServer_OpenSim.dll	…
HttpServer_OpenSim.pdb	…
HttpServer_OpenSim.xml	…
Ionic.Zip.dll	…
LaunchSLClient.ini	…
Mono.Addins.CecilReflector.dll	…
Mono.Addins.Setup.dll	…
Mono.Addins.dll	…
Mono.Addins.dll.config	…
Mono.Data.Sqlite.dll	…
Mono.Data.Sqlite.dll.config	…
Mono.Data.SqliteClient.dll	…
MsgPack.dll	…
MySql.Data.dll	…
NDesk.Options.dll	…
Nini.dll	…
Ode.NET.dll	…
Ode.NET.dll.config	…
OpenMetaverse.Http.XML	…
OpenMetaverse.Rendering.Meshmerizer.dll	…
OpenMetaverse.StructuredData.XML	…
OpenMetaverse.StructuredData.dll	…
OpenMetaverse.XML	…
OpenMetaverse.dll	…
OpenMetaverse.dll.config	…
OpenMetaverseTypes.XML	…
OpenMetaverseTypes.dll	…
OpenSim.32BitLaunch.exe	…
OpenSim.32BitLaunch.exe.config	…
OpenSim.32BitLaunch.pdb	…
OpenSim.ConsoleClient.exe.config	…
OpenSim.ConsoleClient.ini.example	…
OpenSim.Services.exe.config	…
OpenSim.addin.xml	…
OpenSim.exe.config	…
OpenSim.ini.example	…
OpenSimDefaults.ini	…
OpenSimDefaults.ini.example	…
OpenSimExport.exe.config	…
Prebuild.exe	…
PrimMesher.dll	…
Robust.32BitLaunch.exe	…
Robust.32BitLaunch.exe.config	…
Robust.HG.ini.example	…
Robust.exe.config	…
Robust.ini.example	…
SimpleApp.exe.config	…
Tools.dll	…
Warp3D.dll	…
XMLRPC.dll	…
avatar-texture.dat	…
defaultstripe.png	…
excuses	…
http_404.html.example	…
http_500.html.example	…
http_loginform.html.example	…
log4net.dll	…
nunit.framework.dll	…
openjpeg-dotnet-x86_64.dll	…
openjpeg-dotnet.dll	…
opensim-ode.sh	…
pCampBot.exe.config	…
pCampBotSentences.txt	…
shutdown_commands.txt.example	…
startup_commands.txt.example	…
startuplogo.txt	…
zlib.net.dll	…