aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
diff options
context:
space:
mode:
authorMelanie2011-11-14 20:03:47 +0000
committerMelanie2011-11-14 20:03:47 +0000
commitafca742392e30748de13a125f932046949af0bcb (patch)
tree34e9dd92533abe446e356d9fb1ad8625cb28c9bc /OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
parentMerge branch 'master' into bigmerge (diff)
parentminor: remove some mono compiler warnings (diff)
downloadopensim-SC-afca742392e30748de13a125f932046949af0bcb.zip
opensim-SC-afca742392e30748de13a125f932046949af0bcb.tar.gz
opensim-SC-afca742392e30748de13a125f932046949af0bcb.tar.bz2
opensim-SC-afca742392e30748de13a125f932046949af0bcb.tar.xz
Merge branch 'master' into bigmerge
Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs')
0 files changed, 0 insertions, 0 deletions