summaryrefslogtreecommitdiffstats
path: root/resources.qrc
diff options
context:
space:
mode:
authorAnne Jan Brouwer <brouwer@annejan.com>2015-11-17 17:24:46 +0100
committerAnne Jan Brouwer <annejan@noprotocol.com>2015-11-17 17:24:46 +0100
commitda55844d0b25d6832c8a15e0f07e3588c8d729b2 (patch)
treeb3c2128472d857468282778f77663f840250b582 /resources.qrc
parent57f57365ca5690061569e75e645096c5f6658dd7 (diff)
parent1957661349d9ae936c778b9e7610bb8664ae2ac8 (diff)
Merge branch 'master' into develop
Diffstat (limited to 'resources.qrc')
0 files changed, 0 insertions, 0 deletions