Shaun Bennett 0b41450603 Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" ... This reverts commit 6c17b2926c.		2015-11-12 17:51:13 -05:00
..
org.eclipse.core.resources.prefs	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
org.eclipse.jdt.core.prefs	Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""	2015-11-12 17:51:13 -05:00
org.eclipse.jdt.ui.prefs	Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta""	2015-11-12 17:51:13 -05:00