aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
diff options
context:
space:
mode:
authorMelanie2012-05-15 21:19:06 +0100
committerMelanie2012-05-15 21:19:06 +0100
commita36c487c791ba38a75433b92f5b0e5c75d9b52a4 (patch)
treec502a631cbd54c43168a71240f872f76cf50b9c5 /OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
parentMerge branch 'avination' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-a36c487c791ba38a75433b92f5b0e5c75d9b52a4.zip
opensim-SC-a36c487c791ba38a75433b92f5b0e5c75d9b52a4.tar.gz
opensim-SC-a36c487c791ba38a75433b92f5b0e5c75d9b52a4.tar.bz2
opensim-SC-a36c487c791ba38a75433b92f5b0e5c75d9b52a4.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs')
0 files changed, 0 insertions, 0 deletions