diff options
| author | Melanie | 2013-03-15 23:45:32 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-15 23:45:32 +0000 |
| commit | b9146a79220c7e15ff0241fb6216028ddf15bee8 (patch) | |
| tree | 18e3342a99e448b19a1a5bb29d9579ef9d9bb817 /OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Change the table and field names of XAssetService mysql db tables to be capit... (diff) | |
| download | opensim-SC-b9146a79220c7e15ff0241fb6216028ddf15bee8.zip opensim-SC-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.gz opensim-SC-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.bz2 opensim-SC-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/BaseOpenSimServer.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/AssemblyInfo.cs')
0 files changed, 0 insertions, 0 deletions