59b63b6406
Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs |
||
---|---|---|
.. | ||
Properties | ||
Remote | ||
Service | ||
OfflineIMRegionModule.cs |
59b63b6406
Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs |
||
---|---|---|
.. | ||
Properties | ||
Remote | ||
Service | ||
OfflineIMRegionModule.cs |