Kristian S. Stangeland 7e20abdd37 Merge branch 'master' into gh-pages ... Conflicts: ItemDisguise/.settings/org.eclipse.core.resources.prefs		2013-05-14 01:24:47 +02:00
..
.settings	Added small settings file in ItemDisguise	2013-05-14 01:19:22 +02:00
src/main/java	Switching from UTF-8 to cp1252.	2012-10-12 00:49:47 +02:00
target	Useless changes.	2013-03-05 16:59:22 +01:00
.classpath	Ignore players that have logged out and have not been injected.	2013-03-17 23:55:08 +01:00
.gitignore	Converted ItemDisguise to a maven project.	2012-10-11 09:09:42 +02:00
.project	Converted ItemDisguise to a maven project.	2012-10-11 09:09:42 +02:00
pom.xml	Switching to the public repository group.	2012-10-13 18:07:02 +02:00