Melanie 7cf377fff0 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Data/MySQL/MySQLAssetData.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs

2013-04-10 13:20:55 +01:00

..

Properties

Deleted all AssemblyFileVersion directives

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

Tests

minor: remove some mono compiler warnings in script regression tests

2013-02-27 20:38:10 +00:00

ScriptInstance.cs

Merge branch 'master' into careminster

2013-04-10 13:20:55 +01:00

ScriptSerializer.cs

Revert "Fix script "Running" behavior"

2012-07-16 23:31:55 +01:00