ElgarL 8fac5f6beb Merge branch 'groupmanager' of ... https://ElgarL@github.com/essentials/Essentials.git into groupmanager Conflicts: EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java		2012-07-10 14:27:50 +01:00
..
nbproject	Netbeans 7.1 stuff	2012-01-12 23:37:39 +01:00
src	Merge branch 'groupmanager' of	2012-07-10 14:27:50 +01:00
.classpath	Remove unneeded dependency of craftbukkit (Eclipse building)	2012-04-21 02:32:02 +01:00
.project	Catch all errors in badly formatted groups.	2012-01-31 03:16:34 +00:00
build.xml	Correcting all line endings to LF	2011-07-24 23:19:12 +02:00