Merge branch 'groupmanager' of

Browse Source

https://elgarl@github.com/essentials/Essentials.git into groupmanager

Conflicts:
	EssentialsGroupManager/src/Changelog.txt

...

This commit is contained in:

ElgarL

2011-10-11 01:05:48 +01:00

parent 8aba67f610 d3dace3cd3

commit 9468d8b3ec

13 changed files with 1 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java Executable file → Normal file