diff options
author | Andrew Dolgov <[email protected]> | 2012-12-01 15:36:09 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2012-12-01 15:36:09 +0400 |
commit | 8245607f3d6f055bb3feec288777f4216196b366 (patch) | |
tree | ddf0a9fa4784b1e9be13dcf8fce44297b83da5ec /.settings/org.eclipse.jdt.core.prefs | |
parent | 022b17a79b02d1199b4c6fe3b98d98ad3c2ef1e7 (diff) | |
parent | f00ef55ad2687d0dd783c9b0b7a29d125ce13684 (diff) |
Merge branch 'master' of github.com:gothfox/Tiny-Comics-Reader
Conflicts:
res/values/strings.xml
Diffstat (limited to '.settings/org.eclipse.jdt.core.prefs')
0 files changed, 0 insertions, 0 deletions