Melanie 75fd256ef8 Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge		2011-10-11 22:43:27 +01:00
..
ApplicationPlugins	Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge	2011-10-11 22:42:18 +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	Make the text mode remote console really work. It can now be used to send	2010-06-08 22:05:06 +01:00
Data	Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge	2011-10-11 22:26:18 +01:00
Framework	Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge	2011-10-11 22:42:18 +01:00
Region	Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge	2011-10-11 22:43:27 +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	Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge	2011-10-11 22:42:18 +01:00
Tools	Make default serverside_object_permissions = true since this better matches user expectations.	2011-07-01 23:06:46 +01:00