diff options
| author | Melanie | 2012-01-22 16:35:14 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-22 16:35:14 +0000 |
| commit | 02572ab1d3ae23205e0a2192c9b30aa22b566143 (patch) | |
| tree | fe483f85a77cb00a21dd4be65a71941329f22482 /OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Change the key name I missed in last commit (diff) | |
| download | opensim-SC-02572ab1d3ae23205e0a2192c9b30aa22b566143.zip opensim-SC-02572ab1d3ae23205e0a2192c9b30aa22b566143.tar.gz opensim-SC-02572ab1d3ae23205e0a2192c9b30aa22b566143.tar.bz2 opensim-SC-02572ab1d3ae23205e0a2192c9b30aa22b566143.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/RegionSettings.cs
Diffstat (limited to 'OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs')
0 files changed, 0 insertions, 0 deletions