ProtocolLib/ItemDisguise/.settings
Kristian S. Stangeland b9ed36641f Merge branch 'master' into gh-pages
Conflicts:
	ProtocolLib/.classpath
	ProtocolLib/.settings/org.eclipse.core.resources.prefs
2012-10-17 08:01:30 +02:00
..
org.eclipse.core.resources.prefs Merged. 2012-10-17 07:58:24 +02:00
org.eclipse.jdt.core.prefs Using a self-hosted repository for now. 2012-10-12 04:09:38 +02:00
org.eclipse.m2e.core.prefs Converted ItemDisguise to a maven project. 2012-10-11 09:09:42 +02:00