diff options
| author | Melanie | 2013-08-17 03:23:45 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-17 03:23:45 +0100 |
| commit | bef03fb30be67dbe671dcc330558daf8a6c4bb22 (patch) | |
| tree | 6d221db8af5bdb1a09190527a79aae3dfe3116d9 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove mono compiler warnings from UserProfilesModule (diff) | |
| download | opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.zip opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.gz opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.bz2 opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs')
0 files changed, 0 insertions, 0 deletions