Melanie 4e9457ca0c Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge ...

Conflicts:
	OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs

2011-10-25 03:26:09 +01:00

..

Application

Merge commit 'aeb4ff02744573cb91e8991bf9df81412b80e156' into bigmerge

2011-10-25 02:54:41 +01:00

ClientStack

Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge

2011-10-25 02:54:34 +01:00

CoreModules

Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge

2011-10-25 03:26:09 +01:00

DataSnapshot

Eliminate pointless checks of SOG.RootPart != null

2011-09-01 02:11:00 +01:00

Framework

Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge

2011-10-25 03:19:55 +01:00

OptionalModules

Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge

2011-10-25 03:18:29 +01:00

Physics

Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge

2011-10-25 03:18:10 +01:00

RegionCombinerModule

Merge branch 'master' into careminster-presence-refactor

2011-04-06 09:22:55 +01:00

ReplaceableModules

…

ScriptEngine

Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmerge

2011-10-25 03:19:35 +01:00

UserStatistics

WebStats - Home Link Fix

2011-10-06 22:30:24 +01:00