diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:22:31 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:22:31 +0200 |
| commit | 8146a18be0c98751816ffe40661308081a57573d (patch) | |
| tree | 69a2ddc07bad88df0d27d6b9a33ebb1ac522b71a /.gitignore | |
| parent | 9f4c45b58b82b59740dc60e22cba6894efd6c164 (diff) | |
| parent | 167faeec86ed4d9c9f099f5180784c7b0cb9aa42 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
Change-Id: Ie8bf1903f9c7c1ccd5b05a3f97049ae0882b88b8
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,3 +1,4 @@ +.DS_Store *.pro.user *.pro.shared *~ |