summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-03-14 09:25:02 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-03-14 09:25:02 +0100
commitac46d0b14d7601412c28675ab2ff9fcd31e097be (patch)
tree93dba8088abb7e634d65cf4c0bd90cb1b8793d47 /doc
parentfca5998b637ce656306224706c1060d806193c48 (diff)
parent8c683045f8933a8574a39e8222d29cb5bc5b243a (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions