diff options
| author | Melanie | 2012-04-13 03:00:48 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-13 03:00:48 +0100 |
| commit | fe65b518765a8c88c1f3067b47d775b9b1142961 (patch) | |
| tree | 3a97f13715090d8c925543ae49ecae1930578d5d /OpenSim/Framework/AssemblyInfo.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Mantis 55025 Implement script time. (diff) | |
| download | opensim-SC-fe65b518765a8c88c1f3067b47d775b9b1142961.zip opensim-SC-fe65b518765a8c88c1f3067b47d775b9b1142961.tar.gz opensim-SC-fe65b518765a8c88c1f3067b47d775b9b1142961.tar.bz2 opensim-SC-fe65b518765a8c88c1f3067b47d775b9b1142961.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'OpenSim/Framework/AssemblyInfo.cs')
0 files changed, 0 insertions, 0 deletions