diff options
| author | Melanie | 2012-01-25 15:02:54 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-25 15:02:54 +0000 |
| commit | 7444f3bfad0bf8007837ae4253390e364dafd69e (patch) | |
| tree | 1503c540cd424d88a10f51ca0913a97b710b2ded /Makefile | |
| parent | Change the WorldMapModule to use SOG rather than SOP for the telehub ans (diff) | |
| parent | Merge branch 'master' of /home/opensim/src/opensim (diff) | |
| download | opensim-SC-7444f3bfad0bf8007837ae4253390e364dafd69e.zip opensim-SC-7444f3bfad0bf8007837ae4253390e364dafd69e.tar.gz opensim-SC-7444f3bfad0bf8007837ae4253390e364dafd69e.tar.bz2 opensim-SC-7444f3bfad0bf8007837ae4253390e364dafd69e.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions