NewGarbo 369687b5dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha ... Conflicts: Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs		2015-12-23 18:31:51 +00:00
..
.settings	Remove project specific settings	2015-12-13 16:41:37 +13:00
src	Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha	2015-12-23 18:31:51 +00:00
.classpath	Treasure changes :O	2015-02-09 20:24:20 +13:00
.project	Initial Commit	2013-08-27 08:14:08 -07:00
Mineplex.Core.Common.iml	Update IntelliJ files for latest changes	2014-09-03 11:42:50 -05:00