diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:26:29 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:26:29 +0200 |
| commit | 133da89acbbfd8acac7791a5dea0b01a3d33df96 (patch) | |
| tree | 109e34a494c428160aeb5a974b310b0cde87789f /.gitattributes | |
| parent | 4a4b2d9a4e9a1fb13edb297384b20b75c3e0e4af (diff) | |
| parent | f0a5def2727d30049cbc73425abe55acee3ffa8b (diff) | |
| download | qtx11extras-133da89acbbfd8acac7791a5dea0b01a3d33df96.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: I3d5b05b358cd18ad85fa9ea42f94a312f81d91f5
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions