diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-19 17:53:47 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-19 17:53:47 +0200 |
| commit | 4afefb066fb70aaa7dd564c7285db4c4658b6ee5 (patch) | |
| tree | d092fc410b6eb79c20ea49ad6fb29edd79347607 /.gitattributes | |
| parent | 7f772dbd2ec1c024d9168620b12889f7db9ce5f4 (diff) | |
| parent | 702c6f81771c9667c3ef1b2c7ce77fb1c8e2982a (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I64648cf46b65e9396ef58b8f7ed8437bf2339e7e
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions