snowleo 3f9e19d279 Merge branch 'refs/heads/groupmanager' ... Conflicts: EssentialsGroupManager/src/globalgroups.yml		2012-04-11 21:57:58 +02:00
..
nbproject	Netbeans 7.1 stuff	2012-01-12 23:37:39 +01:00
src	Merge branch 'refs/heads/groupmanager'	2012-04-11 21:57:58 +02:00
.classpath	Merge remote branch 'remotes/origin/groupmanager'	2011-12-12 22:51:18 +00: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