aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-16 00:34:44 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-16 00:34:44 +0100
commit2b21bc13fcd9bb942798bc8f05603a512c1ffa3a (patch)
tree21f95dbf8214bbf68ce147874c415d4cda679c36 /src/main/res/values
parent88c3537b6869996098da25954985fcb0c6971635 (diff)
parentac4eabbd2257217eebddfc33840a618e78a97cad (diff)
Merge branch 'master' into development
Diffstat (limited to 'src/main/res/values')
0 files changed, 0 insertions, 0 deletions