aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
diff options
context:
space:
mode:
authorMelanie2011-10-26 17:48:51 +0100
committerMelanie2011-10-26 17:48:51 +0100
commit6a96c9546d4fd89f6e9319246cc2270836cf19f7 (patch)
treee6492419b9a03cb78435e911b345b4a31f749162 /OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
parentMerge branch 'master' into bigmerge (diff)
parentMerge branch 'master' of /home/opensim/var/repo/opensim (diff)
downloadopensim-SC-6a96c9546d4fd89f6e9319246cc2270836cf19f7.zip
opensim-SC-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.gz
opensim-SC-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.bz2
opensim-SC-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs')
0 files changed, 0 insertions, 0 deletions