aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout-sw360dp
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-20 19:49:33 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-20 19:49:33 +0200
commit545cad41e6be6a2a07cf3fc5824509514e758df7 (patch)
treee7b6a79e57df7c4e558f30c922518d32b6574c9d /res/layout-sw360dp
parent49b7c7779da38c215dfeb0b3ef19fbce2a6ea3e1 (diff)
parentb16bc24c7124ac0cb9f02931cc3ba228a3396935 (diff)
Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development
Conflicts: res/values-eu/strings.xml
Diffstat (limited to 'res/layout-sw360dp')
0 files changed, 0 insertions, 0 deletions