NewGarbo cc857da88e Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta ... Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java		2016-01-31 16:27:14 +00:00
..
.settings	MAVEN TEST COMMIT	2016-01-31 16:21:04 +00:00
src/mineplex/core	Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta	2016-01-31 16:27:14 +00:00
.classpath	MAVEN TEST COMMIT	2016-01-31 16:21:04 +00:00
.project	MAVEN TEST COMMIT	2016-01-31 16:21:04 +00:00
pom.xml	Include version.properties in Mineplex.Core	2016-01-21 16:37:35 -05:00
version.properties	Include version.properties in Mineplex.Core	2016-01-21 16:37:35 -05:00