Melanie Thielker e1b2ecdfdc Merge branch 'avination-current' ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs

2014-07-19 22:32:07 +02:00

..

Addons

Can delete the Offline Messages sent to/from a user.

2014-01-16 00:24:51 +00:00

ApplicationPlugins

Merge branch 'master' into careminster

2014-01-28 20:47:36 +00:00

Capabilities

Merge branch 'master' into careminster

2013-11-23 19:13:22 +00: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 commit '4153cfbf14132931b981168b7b3e7c5b8d5be8b5'

2014-06-21 00:22:29 +02:00

Framework

Merge branch 'avination-current'

2014-07-19 22:32:07 +02:00

Region

Merge branch 'avination-current'

2014-07-19 22:32:07 +02:00

Server

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

2014-06-21 00:39:55 +02:00

Services

Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

2014-06-21 00:39:55 +02:00

Tests

Merge branch 'master' into careminster

2014-01-28 21:02:20 +00:00

Tools

Update OpenSim.32BitLaunch.exe and Robust.32BitLaunch.exe to .NET 4 versions.

2013-11-13 01:07:14 +00:00