diff options
| author | Melanie | 2011-11-14 20:03:47 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-14 20:03:47 +0000 |
| commit | afca742392e30748de13a125f932046949af0bcb (patch) | |
| tree | 34e9dd92533abe446e356d9fb1ad8625cb28c9bc /OpenSim/Tests/Common/Helpers/AssetHelpers.cs | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | minor: remove some mono compiler warnings (diff) | |
| download | opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.zip opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.tar.gz opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.tar.bz2 opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'OpenSim/Tests/Common/Helpers/AssetHelpers.cs')
0 files changed, 0 insertions, 0 deletions