diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:09:26 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:09:26 +0100 |
commit | dc452d0b83229ea8eb518b363d1402bda62ecbcd (patch) | |
tree | 4b712ab29b87e87d9a950fb3f6bf5207ac631e2d /.gitattributes | |
parent | 9324787ba460c89927830f5f0d4d8086a0333596 (diff) | |
parent | 9131e081b91b5bbce791d3e328ae46fdb35c565d (diff) | |
download | qtx11extras-dc452d0b83229ea8eb518b363d1402bda62ecbcd.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Icab7fb1dd11851639a46b2cb211ded5df92a1dbe
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions