Melanie 72206a0e29 Merge branch 'avination-current' into careminster ...

Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs

2013-09-16 22:32:53 +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 'avination-current' into careminster

2013-09-16 22:32:53 +01:00

ScriptSerializer.cs

Revert "Fix script "Running" behavior"

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