![]() Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs |
||
---|---|---|
.. | ||
Properties | ||
AssetService.cs | ||
AssetServiceBase.cs | ||
XAssetService.cs | ||
XAssetServiceBase.cs |
![]() Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs |
||
---|---|---|
.. | ||
Properties | ||
AssetService.cs | ||
AssetServiceBase.cs | ||
XAssetService.cs | ||
XAssetServiceBase.cs |