summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-03-19 10:14:25 +0100
committerSergio Ahumada <sergio.ahumada@digia.com>2013-03-19 10:14:25 +0100
commitcecb0c21b6d1731e50e47ff3814cfc9df4dcffeb (patch)
tree43ba091b50f39d15c4b8bc57f59c7c541aab1fe6
parent8d2d75d51bc62214936be5a1078677e3c291c550 (diff)
parent247ba8153251422622f89246a0af316dcde486fb (diff)
downloadqttranslations-cecb0c21b6d1731e50e47ff3814cfc9df4dcffeb.tar.gz
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle Conflicts: sync.profile Change-Id: Iee9311ffd7827b6893234bc2667691e4c559281e
0 files changed, 0 insertions, 0 deletions