diff options
| author | Glenn Martin | 2015-05-19 14:07:44 -0400 |
|---|---|---|
| committer | Glenn Martin | 2015-05-19 14:07:44 -0400 |
| commit | 91a55c0794367eaf56b1eef887b28ff8d4645bfb (patch) | |
| tree | fdade1a62aabdf4138f6cbbcbf03bdc9be2ca3c2 /OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs | |
| parent | Merge branch 'moses.metricsPhase2' of git.irl.ucf.edu:/irl/git/opensim into m... (diff) | |
| parent | Merge pull request #5 from gamucf/moses.metricsPhase1 (diff) | |
| download | opensim-SC-91a55c0794367eaf56b1eef887b28ff8d4645bfb.zip opensim-SC-91a55c0794367eaf56b1eef887b28ff8d4645bfb.tar.gz opensim-SC-91a55c0794367eaf56b1eef887b28ff8d4645bfb.tar.bz2 opensim-SC-91a55c0794367eaf56b1eef887b28ff8d4645bfb.tar.xz | |
Merge branch 'master' of https://github.com/M-O-S-E-S/opensim into moses.metricsPhase2
Fixed conflicts.
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs')
0 files changed, 0 insertions, 0 deletions