diff options
| author | Melanie | 2012-08-25 23:36:33 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-25 23:36:33 +0100 |
| commit | d76ff560d4eae4035f959731fb1da9b5185fa9ec (patch) | |
| tree | b37cebde4afde373ec96b782be6256fb17150421 /OpenSim/Server/ServerMain.cs | |
| parent | Minor formatting cleanup (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-d76ff560d4eae4035f959731fb1da9b5185fa9ec.zip opensim-SC_OLD-d76ff560d4eae4035f959731fb1da9b5185fa9ec.tar.gz opensim-SC_OLD-d76ff560d4eae4035f959731fb1da9b5185fa9ec.tar.bz2 opensim-SC_OLD-d76ff560d4eae4035f959731fb1da9b5185fa9ec.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Server/ServerMain.cs')
0 files changed, 0 insertions, 0 deletions