diff options
| author | Melanie | 2012-11-04 22:37:28 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-04 22:37:28 +0000 |
| commit | dd416298f1da71b801c789367a4408f5c2728df1 (patch) | |
| tree | 9aa8ed8419dd536fe2f326755ad3468289818ffc /OpenSim/Services/Interfaces/IAssetService.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add a method to query all registered script constants to allow non-XEngine (diff) | |
| download | opensim-SC_OLD-dd416298f1da71b801c789367a4408f5c2728df1.zip opensim-SC_OLD-dd416298f1da71b801c789367a4408f5c2728df1.tar.gz opensim-SC_OLD-dd416298f1da71b801c789367a4408f5c2728df1.tar.bz2 opensim-SC_OLD-dd416298f1da71b801c789367a4408f5c2728df1.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Services/Interfaces/IAssetService.cs')
0 files changed, 0 insertions, 0 deletions