aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
diff options
context:
space:
mode:
authorMelanie2012-10-17 00:12:30 +0100
committerMelanie2012-10-17 00:12:30 +0100
commit39cbf4f7a114dca999afc42c74bfd100212e3842 (patch)
treeb0b3f9f1350b92eca7dea1460a679dfa8d0ea378 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
parentMerge branch 'master' into careminster (diff)
parentminor: Make BasicCircuitTests.SetUp() call overriden base method instead of i... (diff)
downloadopensim-SC-39cbf4f7a114dca999afc42c74bfd100212e3842.zip
opensim-SC-39cbf4f7a114dca999afc42c74bfd100212e3842.tar.gz
opensim-SC-39cbf4f7a114dca999afc42c74bfd100212e3842.tar.bz2
opensim-SC-39cbf4f7a114dca999afc42c74bfd100212e3842.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-12-23 09:43:48 +0000