diff options
| author | Melanie | 2012-11-15 03:46:10 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-15 03:46:10 +0000 |
| commit | 5895c4cc6f698bcb415b08a96322f06fb44413ca (patch) | |
| tree | 5b223f297b27ac3966c65526f422fc82095b9b86 /OpenSim/Framework/Servers | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Improve inventory folder version updating for mssql database plugin. (diff) | |
| download | opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.zip opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.tar.gz opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.tar.bz2 opensim-SC_OLD-5895c4cc6f698bcb415b08a96322f06fb44413ca.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
Diffstat (limited to 'OpenSim/Framework/Servers')
0 files changed, 0 insertions, 0 deletions