Melanie b0ee174296 Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmerge		2011-10-12 01:41:44 +01:00
..
ApplicationPlugins	Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge	2011-10-12 01:30:14 +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 '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge	2011-10-11 22:26:18 +01:00
Framework	Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge	2011-10-11 23:21:36 +01:00
Region	Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmerge	2011-10-12 01:41:44 +01:00
Server	Resolve merge commits, stage 1	2011-09-04 07:06:36 -07:00
Services	Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge	2011-10-12 01:30:14 +01:00
TestSuite	…
Tests	Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge	2011-10-11 22:42:18 +01:00
Tools	Added a setting to [Startup] section of config that will allow the simulator to start up with no regions configured.	2011-09-24 01:59:02 +01:00