diff options
| author | ElgarL <ElgarL@palmergames.com> | 2012-07-10 14:27:50 +0100 |
|---|---|---|
| committer | ElgarL <ElgarL@palmergames.com> | 2012-07-10 14:27:50 +0100 |
| commit | 8fac5f6beb0bd6efb4881857222aaff263a75fca (patch) | |
| tree | 97821cfa3e0df5f813d0499c14c3e6a9ecc99d44 /EssentialsGroupManager/nbproject | |
| parent | a46497255ecb600bcee8ecca99fff53dd0b716f4 (diff) | |
| parent | efec7c8f95ee8bb5c618f27cfd67f91369fc280b (diff) | |
| download | Essentials-8fac5f6beb0bd6efb4881857222aaff263a75fca.tar Essentials-8fac5f6beb0bd6efb4881857222aaff263a75fca.tar.gz Essentials-8fac5f6beb0bd6efb4881857222aaff263a75fca.tar.lz Essentials-8fac5f6beb0bd6efb4881857222aaff263a75fca.tar.xz Essentials-8fac5f6beb0bd6efb4881857222aaff263a75fca.zip | |
Merge branch 'groupmanager' of
https://ElgarL@github.com/essentials/Essentials.git into groupmanager
Conflicts:
EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
Diffstat (limited to 'EssentialsGroupManager/nbproject')
0 files changed, 0 insertions, 0 deletions