aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorMelanie2011-10-25 01:42:52 +0100
committerMelanie2011-10-25 01:42:52 +0100
commita8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e (patch)
tree197217a9944bf63f7bfeacf52ee7482bfde52ca9 /OpenSim/Server/Handlers
parentMerge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge (diff)
parentremove some mono compiler warnings (diff)
downloadopensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.zip
opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.gz
opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.bz2
opensim-SC-a8cc81a37e3e97fec4b4ce397c53e3b50fc84c4e.tar.xz
Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmerge
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Server/Handlers')
0 files changed, 0 insertions, 0 deletions