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

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

2013-02-05 21:30:12 +00:00

..

Agent

Merge branch 'master' into careminster

2013-01-31 02:53:11 +00:00

Asset

Merge branch 'master' into careminster

2013-02-04 19:21:39 +00:00

Avatar

Merge branch 'avination' into careminster

2013-01-31 20:36:20 +00:00

Framework

Merge branch 'master' into careminster

2013-02-05 21:30:12 +00:00

Hypergrid

Merge branch 'master' into careminster

2012-11-13 10:49:24 +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

Scripting

Merge branch 'master' into careminster

2013-01-26 01:56:23 +00:00

ServiceConnectorsIn

Another 11 modules' directions moved out of .addin.xml

2012-11-13 08:36:44 -08:00

ServiceConnectorsOut

Merge branch 'master' into careminster

2013-02-04 19:21:39 +00:00

World

Merge branch 'master' into careminster

2013-02-05 21:30:12 +00:00