diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
bin/OpenMetaverse.StructuredData.XML
bin/OpenMetaverse.XML
bin/OpenMetaverseTypes.XML
Diffstat (limited to 'bin/Physics/OpenSim.Region.Physics.UbitOdePlugin.dll.config')
0 files changed, 0 insertions, 0 deletions