nossr50 b8e128e0a9 Merge branch 'master' of github.com:mcMMO-Dev/mcMMO ... Conflicts: src/main/java/com/gmail/nossr50/locale/mcLocale.java		2012-04-26 11:54:45 -07:00
..
assembly	Let's make this a Maven project!	2012-01-09 11:19:39 -08:00
java/com/gmail/nossr50	Merge branch 'master' of github.com:mcMMO-Dev/mcMMO	2012-04-26 11:54:45 -07:00
resources	Minor locale fixes	2012-04-26 20:09:04 +02:00