diff options
| author | ElgarL <ElgarL@palmergames.com> | 2011-10-11 01:05:48 +0100 |
|---|---|---|
| committer | ElgarL <ElgarL@palmergames.com> | 2011-10-11 01:05:48 +0100 |
| commit | 9468d8b3ec9877f148896f259804dfaba7b1174a (patch) | |
| tree | da60460cc8b4805107431161d31aa3ffaca8b5fe /EssentialsGroupManager/src/org/anjocaido/groupmanager/data | |
| parent | 8aba67f610a16374d197f5f9212f5f6b152d809e (diff) | |
| parent | d3dace3cd334502a0e845d1f5940a78011f68434 (diff) | |
| download | Essentials-9468d8b3ec9877f148896f259804dfaba7b1174a.tar Essentials-9468d8b3ec9877f148896f259804dfaba7b1174a.tar.gz Essentials-9468d8b3ec9877f148896f259804dfaba7b1174a.tar.lz Essentials-9468d8b3ec9877f148896f259804dfaba7b1174a.tar.xz Essentials-9468d8b3ec9877f148896f259804dfaba7b1174a.zip | |
Merge branch 'groupmanager' of
https://elgarl@github.com/essentials/Essentials.git into groupmanager
Conflicts:
EssentialsGroupManager/src/Changelog.txt
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/data')
| -rw-r--r--[-rwxr-xr-x] | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java index f17d8b21e..f17d8b21e 100755..100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java index 4775eac1f..4775eac1f 100755..100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/GroupVariables.java diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java index 3f3a6c374..3f3a6c374 100755..100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/UserVariables.java diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java index 547e6266d..547e6266d 100755..100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Variables.java |