Melanie e3ea2c4bee Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs

2013-02-23 20:37:09 +00:00

..

Addons

Added new Util function for reading config vars that's more generic than the one I added yesterday -- this is for helping move config vars out of [Startup]

2013-02-22 15:57:33 -08:00

ApplicationPlugins

Merge branch 'master' into careminster

2013-02-22 01:28:54 +00:00

Capabilities

Merge branch 'master' into careminster

2013-02-22 01:28:54 +00:00

ConsoleClient

Bump version and assembly version numbers from 0.7.5 to 0.7.6

2013-02-05 00:23:17 +00:00

Data

Merge branch 'master' into careminster

2013-02-22 01:28:54 +00:00

Framework

Merge branch 'master' into careminster

2013-02-23 20:37:09 +00:00

Region

Merge branch 'master' into careminster

2013-02-23 20:37:09 +00:00

Server

Merge branch 'master' into careminster

2013-02-23 20:37:09 +00:00

Services

Merge branch 'master' into careminster

2013-02-23 20:37:09 +00:00

Tests

Merge branch 'master' into careminster

2013-02-16 05:37:12 +00:00

Tools

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00