diff options
author | Bananeweizen <Bananeweizen@gmx.de> | 2012-02-16 05:58:31 +0100 |
---|---|---|
committer | Bananeweizen <Bananeweizen@gmx.de> | 2012-02-16 05:58:31 +0100 |
commit | b166652df38ac6c4534856ead21acd5bfb308a5a (patch) | |
tree | f1f87ded63bc76b9f71500d756dcb7fc4f03f23b /tests | |
parent | d29ce0d047542329b4396b02cf42567c235e5cb0 (diff) | |
parent | 1bff1794fe86c0324a881ef90180f16c3c528f23 (diff) | |
download | cgeo-b166652df38ac6c4534856ead21acd5bfb308a5a.zip cgeo-b166652df38ac6c4534856ead21acd5bfb308a5a.tar.gz cgeo-b166652df38ac6c4534856ead21acd5bfb308a5a.tar.bz2 |
Merge remote-tracking branch 'seromenho/master'
Conflicts:
main/res/values-pt/strings.xml
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions