Melanie 03d533dc1e Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge		2011-10-11 22:15:25 +01:00
..
Application	Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge	2011-10-11 21:32:24 +01:00
ClientStack	Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge	2011-10-11 21:21:44 +01:00
CoreModules	Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge	2011-10-11 22:15:25 +01:00
DataSnapshot	Eliminate pointless checks of SOG.RootPart != null	2011-09-01 02:11:00 +01:00
Examples/SimpleModule	Resolve merge commits, stage 1	2011-09-04 07:06:36 -07:00
Framework	Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge	2011-10-11 22:15:25 +01:00
OptionalModules	Bring us up to date.	2011-09-14 19:11:32 -07:00
Physics	Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge	2011-10-11 22:12:25 +01:00
RegionCombinerModule	Merge branch 'master' into careminster-presence-refactor	2011-04-06 09:22:55 +01:00
ReplaceableModules	…
ScriptEngine	Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge	2011-10-11 22:11:44 +01:00
UserStatistics	Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll	2011-04-30 11:03:22 -07:00