aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
diff options
context:
space:
mode:
authorMelanie2013-02-05 21:30:12 +0000
committerMelanie2013-02-05 21:30:12 +0000
commitd3892bbd0674e4f6912ce89e54712ea405dbbfb8 (patch)
tree70ea1e0fea0e7eff5664bed1103e63d08c7b1c47 /OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.zip
opensim-SC-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.gz
opensim-SC-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.bz2
opensim-SC-d3892bbd0674e4f6912ce89e54712ea405dbbfb8.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Services/Connectors/Authentication/AuthenticationServicesConnector.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-23 18:37:23 +0000