Melanie 818254916c JustinCC's core re-merge		2013-01-16 15:47:55 +00:00
..
ApplicationPlugins	Merge branch 'master' into careminster	2012-11-17 02:03:24 +00:00
Capabilities	Merge branch 'avination' into careminster	2013-01-10 01:25:07 +00:00
ConsoleClient	A few more AssemblyInfos in a few more dlls.	2012-11-14 08:10:15 -08:00
Data	Merge branch 'master' into careminster	2013-01-04 22:39:07 +00:00
Framework	Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster	2013-01-16 01:13:14 +00:00
Region	JustinCC's core re-merge	2013-01-16 15:47:55 +00:00
Server	Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster	2013-01-16 01:13:14 +00:00
Services	Merge branch 'master' into careminster	2013-01-04 22:39:07 +00:00
Tests	Merge branch 'avination' into careminster	2013-01-06 10:52:22 +00:00
Tools	The last few AssemblyInfos. Finished!	2012-11-14 21:18:18 -08:00