Melanie e7d76c91c2 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs		2013-03-29 02:19:12 +00:00
..
Application	Merge branch 'master' into careminster	2013-03-15 23:45:32 +00:00
ClientStack	Merge branch 'master' into careminster	2013-03-28 02:29:07 +00:00
CoreModules	Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster	2013-03-29 02:15:47 +00:00
DataSnapshot	…
Framework	Merge branch 'master' into careminster	2013-03-29 02:19:12 +00:00
OptionalModules	Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster	2013-03-29 02:15:47 +00:00
Physics	Merge commit '6a9630d2bdc27ed702936f4c44e6978f728a9ef0' into careminster	2013-03-29 01:08:33 +00:00
RegionCombinerModule	Add "show borders" command to show the borders of a region.	2013-03-23 00:45:21 +00:00
ReplaceableModules	…
ScriptEngine	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim	2013-03-26 20:32:22 +00:00
UserStatistics	…