diff options
| author | Melanie | 2013-01-11 02:13:10 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-11 02:13:10 +0000 |
| commit | f74915ed4f8831344ee588d9036b7ac866ea4294 (patch) | |
| tree | 5f1021165cf4acc9043b3015c2aac468128fa1dc /OpenSim/Data/Null/NullFriendsData.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix a regression in the last few scene commands changes where setting these v... (diff) | |
| download | opensim-SC-f74915ed4f8831344ee588d9036b7ac866ea4294.zip opensim-SC-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.gz opensim-SC-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.bz2 opensim-SC-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Data/Null/NullFriendsData.cs')
0 files changed, 0 insertions, 0 deletions