Jonathan Williams 3f93e6daf1 Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex ... Conflicts: Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/CreatureForm.java		2013-11-16 01:56:22 -08:00
..
_ReSharper.LOCWebsite	Initial Commit	2013-08-27 08:14:08 -07:00
DBTesting	Initial Commit	2013-08-27 08:14:08 -07:00
Libraries	Initial Commit	2013-08-27 08:14:08 -07:00
LOC.Core	Converted gem rewards to boolean return from website.	2013-10-18 00:46:06 -07:00
LOC.Website.Common	Converted gem rewards to boolean return from website.	2013-10-18 00:46:06 -07:00
LOC.Website.Tests	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex	2013-11-08 15:21:19 -08:00
LOC.Website.Web	Added timeout check for status retrieval	2013-10-26 16:36:48 -05:00
Nautilus.Web.Impulse	Initial Commit	2013-08-27 08:14:08 -07:00
packages	Initial Commit	2013-08-27 08:14:08 -07:00
Local.testsettings	Initial Commit	2013-08-27 08:14:08 -07:00
LOCWebsite.1.2.dotCover	Initial Commit	2013-08-27 08:14:08 -07:00
LOCWebsite.5.1.ReSharper.user	Initial Commit	2013-08-27 08:14:08 -07:00
LOCWebsite.sln	Initial Commit	2013-08-27 08:14:08 -07:00
LOCWebsite.sln.DotSettings.user	Initial Commit	2013-08-27 08:14:08 -07:00
LOCWebsite.suo	Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex	2013-11-16 01:56:22 -08:00
LOCWebsite.suo.orig	Initial Commit	2013-08-27 08:14:08 -07:00
LOCWebsite.vsmdi	Initial Commit	2013-08-27 08:14:08 -07:00
scaffolding.config	Initial Commit	2013-08-27 08:14:08 -07:00
TraceAndTestImpact.testsettings	Initial Commit	2013-08-27 08:14:08 -07:00