Melanie 924df14c5e Merge branch 'master' into careminster ... Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs		2012-09-07 19:49:46 +01:00
..
Interfaces	Revert "Fix script "Running" behavior"	2012-07-16 23:31:55 +01:00
Shared	Merge branch 'master' into careminster	2012-09-07 19:49:46 +01:00
XEngine	Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster	2012-08-25 18:08:10 +01:00