Tom 9cc2d0b60a Now merging the core changes.

2011-09-04 08:30:23 -07:00

..

ApplicationPlugins

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

Capabilities

Don't need to try both AssetService.Get and GetCached in GetMesh since Get always calls GetCached and code paths were identical

2011-08-18 23:36:43 +01:00

ConsoleClient

…

Data

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

Framework

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

Region

Now merging the core changes.

2011-09-04 08:30:23 -07:00

Server

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

Services

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

Tests

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

TestSuite

…

Tools

Make default serverside_object_permissions = true since this better matches user expectations.

2011-07-01 23:06:46 +01:00