diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:51:20 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:51:20 +0200 |
| commit | ef3ba733ffd9df90af311574502b9a7d1400e3e2 (patch) | |
| tree | 4817f3461025bf191e4cc0e6817987648fd2d954 /.qmake.conf | |
| parent | 12dd11480124929e4d0433e17fb6f12f320335a3 (diff) | |
| parent | 16d5447febe09fcb44be6cdb77e03ffb80238bd9 (diff) | |
| download | qttranslations-ef3ba733ffd9df90af311574502b9a7d1400e3e2.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I7186fb9caa9f5a6040f31ab18d04a133cff5f198
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions