aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-05-21 09:19:26 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-05-21 09:19:26 +0200
commit75977818eadd07c6a0adcd41f9af137faaf86349 (patch)
tree675bd5a450a26dc314d4a2ce995e87951642eb89 /src/main/res
parent2364710afb345dfd797a1832c25b134fd34b0e29 (diff)
parent82d4c3b21fd9ed6131ce97929013567f5756a9be (diff)
Merge branch 'master' into development
Diffstat (limited to 'src/main/res')
0 files changed, 0 insertions, 0 deletions