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

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

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

..

Base

Deleted all AssemblyFileVersion directives

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

Handlers

Merge branch 'master' into careminster

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

Properties

Bump version and assembly version numbers from 0.7.5 to 0.7.6

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

ServerMain.cs

missed some conflict markup

2012-10-09 07:59:44 -04:00