Melanie f1fa059b37 Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge		2011-10-11 21:32:24 +01:00
..
ApplicationPlugins	Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge	2011-10-11 21:30:42 +01:00
Capabilities	Save the default terrain texture UUIDs for a new region instead of leaving them as UUID.Zero.	2011-09-09 00:38:04 +01:00
ConsoleClient	…
Data	Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmerge	2011-10-11 21:31:48 +01:00
Framework	Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmerge	2011-10-11 21:32:14 +01:00
Region	Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge	2011-10-11 21:32:24 +01:00
Server	Resolve merge commits, stage 1	2011-09-04 07:06:36 -07:00
Services	Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge	2011-10-11 21:30:42 +01:00
TestSuite	…
Tests	Bring us up to date.	2011-09-14 19:11:32 -07:00
Tools	Make default serverside_object_permissions = true since this better matches user expectations.	2011-07-01 23:06:46 +01:00