summaryrefslogtreecommitdiff
path: root/project.properties
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-10-16 09:52:07 +0400
committerAndrew Dolgov <[email protected]>2013-10-16 09:52:07 +0400
commit8d3315466cbfa4ea70626185153134ed8b9a327c (patch)
treeaf00781a737ef9eb329b0ef88d8b1a06e3e839c3 /project.properties
parent33b8aaadc05d24f515c1930cea636a5126ee65f1 (diff)
parentc5e1254d5957b46c1afb14f933db10e4023fa500 (diff)
Merge branch 'master' of github.com:gothfox/Tiny-Comics-Reader
Conflicts: src/org/fox/ttcomics/ComicListFragment.java
Diffstat (limited to 'project.properties')
0 files changed, 0 insertions, 0 deletions