Jonathan Williams 449fa13cc3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex ... Conflicts: .gitignore		2014-05-27 02:23:22 -07:00
..
.externalToolBuilders	Initial Commit	2013-08-27 08:14:08 -07:00
.settings	Configured eclipse to use UTF-8	2014-05-25 21:04:14 -04:00
src	Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex	2014-05-27 02:23:22 -07:00
.classpath	Updated to 1.6.4	2013-09-20 01:50:56 -07:00
.project	Initial Commit	2013-08-27 08:14:08 -07:00
Nautilus.Core.CraftBukkit.iml	Set up IntelliJ IDEA	2014-05-20 00:39:50 -04:00
Nautilus.Core.CraftBukkit.xml	Initial Commit	2013-08-27 08:14:08 -07:00