Melanie 91b70bf3fe Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs

2013-11-08 17:55:01 +00:00

..

Addons

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00

ApplicationPlugins

Merge branch 'master' into careminster

2013-10-06 18:32:20 +01:00

Capabilities

Merge branch 'master' into careminster

2013-10-06 18:32:20 +01:00

ConsoleClient

Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already.

2013-02-27 00:21:02 +00:00

Data

Merge branch 'master' into careminster

2013-11-03 21:34:36 +00:00

Framework

Merge branch 'master' into careminster

2013-11-08 17:55:01 +00:00

Region

Merge branch 'master' into careminster

2013-11-08 17:55:01 +00:00

Server

Merge branch 'master' into careminster

2013-11-03 21:34:36 +00:00

Services

Merge branch 'master' into careminster

2013-11-08 17:55:01 +00:00

Tests

Merge branch 'master' into careminster

2013-10-04 20:03:12 +01:00

Tools

For individual bots, seed random number generator with a random number from BotManager rather than Environment.Tickcount

2013-11-01 02:04:04 +00:00