local comit for merging

This commit is contained in:
elite
2017-04-02 15:23:19 -05:00
parent 72fde890a6
commit be17c83fef
2 changed files with 17 additions and 0 deletions

1
1.11/.gitignore vendored
View File

@@ -15,6 +15,7 @@ logs
usercache.json
usernamecache.json
options.txt
screenshots/
# eclipse
bin