diff options
| author | Melanie | 2012-09-17 14:15:22 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-17 14:15:22 +0100 |
| commit | 1dd75fcdb476d20b96efba64a842ac82000c400d (patch) | |
| tree | b51eed8de604358841d3cb56db267eaf379c3d3f /OpenSim/Region/Framework/Scenes/Cardinals.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | preventing a null reference exception from being thrown (diff) | |
| download | opensim-SC_OLD-1dd75fcdb476d20b96efba64a842ac82000c400d.zip opensim-SC_OLD-1dd75fcdb476d20b96efba64a842ac82000c400d.tar.gz opensim-SC_OLD-1dd75fcdb476d20b96efba64a842ac82000c400d.tar.bz2 opensim-SC_OLD-1dd75fcdb476d20b96efba64a842ac82000c400d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Cardinals.cs')
0 files changed, 0 insertions, 0 deletions