diff options
| author | Melanie | 2011-10-11 23:01:52 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 23:01:52 +0100 |
| commit | 5536cdf90ce17987ad5447187ebdd00af231ea75 (patch) | |
| tree | a0ad547ffb9d4517ee62258d682504124b861dda /.gitignore | |
| parent | Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmerge (diff) | |
| parent | Added a setting to [Startup] section of config that will allow the simulator ... (diff) | |
| download | opensim-SC-5536cdf90ce17987ad5447187ebdd00af231ea75.zip opensim-SC-5536cdf90ce17987ad5447187ebdd00af231ea75.tar.gz opensim-SC-5536cdf90ce17987ad5447187ebdd00af231ea75.tar.bz2 opensim-SC-5536cdf90ce17987ad5447187ebdd00af231ea75.tar.xz | |
Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions