Merge branch 'master' of ssh://git.dryerzinia.com:22/opt/git/Pokemon
author DrYerzinia
()
committer DrYerzinia
()
commit 950453c06541a40cc5d5eccbb1cc3f03dc7903bb
tree 74b937a437ddd92b1ca16f6759b6a8b08517dc9b
parent a7184cc76d81e4113a01ab659fc83d101c6ddd04
parent 176317e125dc5feb39fea778c53fe40bda883d7e
Merge branch 'master' of ssh://git.dryerzinia.com:22/opt/git/Pokemon
res/Strings.json
src/com/dryerzinia/pokemon/util/Database.java