diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:07:50 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:07:50 +0100 |
| commit | ec7b40e87a2b129ccecf5bc46b5f84cf5563291c (patch) | |
| tree | ff0d2d69c779801df482291772007a94d99fe7da /.gitattributes | |
| parent | 720431716a8af66d1be73a1c9462ef12af831c90 (diff) | |
| parent | 6ac69be3148822a0dafce227eab19b97722b6cc2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ic5bcce627df03517c29597e6bb864f7b3fad2ebe
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions