Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs |
||
|---|---|---|
| .. | ||
| Properties | ||
| GridService.cs | ||
| GridServiceBase.cs | ||
| HypergridLinker.cs | ||
Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs |
||
|---|---|---|
| .. | ||
| Properties | ||
| GridService.cs | ||
| GridServiceBase.cs | ||
| HypergridLinker.cs | ||