diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:03:52 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:03:52 +0100 |
| commit | c5706f05a8315c10398a53ba3b269a2b22d01a7d (patch) | |
| tree | 54f83c3f0bd4ce7325adbd767a46bb146f1fdab6 /.gitattributes | |
| parent | 0c8be637087a3c7aa038cf72f3a3ed6f7aca0510 (diff) | |
| parent | 9b7fd8c7691981bb1d89704f595ebf50daf8876e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I6ea9c40c69f55fa733fd9000a57d570fff21f1e9
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions