Merge branch 'master' of github.com:mcMMO-Dev/mcMMO

Conflicts:
	Changelog.txt
This commit is contained in:
nossr50
2012-04-04 08:01:16 -07:00
16 changed files with 57 additions and 6 deletions

View File

@ -3,7 +3,6 @@ main: com.gmail.nossr50.mcMMO
version: ${project.version}-b${BUILD_NUMBER}
softdepend: [Spout]
authors:
- TheYeti
- nossr50
- NuclearW
- gmcferrin