diff options
| author | Melanie Thielker | 2015-05-20 23:40:52 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2015-05-20 23:40:52 +0200 |
| commit | edcba95ab561abeedc4023c319c578d8ddd83c61 (patch) | |
| tree | 82830abcd2c68a2cad5e2f002a4e2eabae557b7f /.gitignore | |
| parent | Removing duplicate definition (diff) | |
| parent | New values returned by llGetEnv (diff) | |
| download | opensim-SC-edcba95ab561abeedc4023c319c578d8ddd83c61.zip opensim-SC-edcba95ab561abeedc4023c319c578d8ddd83c61.tar.gz opensim-SC-edcba95ab561abeedc4023c319c578d8ddd83c61.tar.bz2 opensim-SC-edcba95ab561abeedc4023c319c578d8ddd83c61.tar.xz | |
Merge branch 'master' into moses
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions