diff options
| author | Melanie | 2012-07-11 14:27:33 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-11 14:27:33 +0100 |
| commit | 89c9528e38b4e06a2af6231ced4ed733bbafa174 (patch) | |
| tree | aed380f4bc51d9102e593446762f476694b9d87c /OpenSim/Region/Application/OpenSim.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | remove expensive and leaked ( in Xengine at least) SayShout timer and (diff) | |
| download | opensim-SC_OLD-89c9528e38b4e06a2af6231ced4ed733bbafa174.zip opensim-SC_OLD-89c9528e38b4e06a2af6231ced4ed733bbafa174.tar.gz opensim-SC_OLD-89c9528e38b4e06a2af6231ced4ed733bbafa174.tar.bz2 opensim-SC_OLD-89c9528e38b4e06a2af6231ced4ed733bbafa174.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
0 files changed, 0 insertions, 0 deletions