Melanie 45b72bf01c Fix some merge issues and a functional issue in the scene manager

2012-07-28 01:06:28 +01:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2012-06-13 02:15:12 +01:00

Capabilities

Merge branch 'master' into careminster

2012-07-13 02:27:16 +01:00

ConsoleClient

Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.

2012-07-11 22:54:22 +01:00

Data

Merge branch 'avination' into careminster

2012-07-11 14:27:33 +01:00

Framework

Merge branch 'master' into careminster

2012-07-28 00:39:36 +01:00

Region

Fix some merge issues and a functional issue in the scene manager

2012-07-28 01:06:28 +01:00

Server

Merge branch 'master' into careminster

2012-07-13 02:27:16 +01:00

Services

Merge branch 'avination' into careminster

2012-07-16 22:22:42 +01:00

Tests

Merge branch 'master' into careminster

2012-07-25 18:19:12 +01:00

Tools

Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.

2012-07-11 22:54:22 +01:00