diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 23:30:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-20 23:30:31 +0100 |
| commit | e5a11fbb3251a98fafd6bebf0b6fc366acb19088 (patch) | |
| tree | 8e1bd6704205307e0a23484221ea1bb67a9f411e /.gitignore | |
| parent | 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df (diff) | |
| parent | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (diff) | |
Merge "Merge branch 'dev' into stable" into refs/staging/stable
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index ec33ed9737..5f9854a674 100644 --- a/.gitignore +++ b/.gitignore @@ -48,6 +48,7 @@ pcviewer.cfg core .qmake.cache .qmake.vars +.device.vars *.prl tags .DS_Store @@ -306,6 +307,7 @@ tests/auto/corelib/thread/qthreadstorage/crashOnExit tests/auto/corelib/io/qresourceengine/qresourceengine tests/auto/corelib/codecs/qtextcodec/echo/echo tests/auto/corelib/plugin/quuid/testProcessUniqueness/testProcessUniqueness +tests/auto/corelib/io/qlockfile/qlockfiletesthelper/qlockfile_test_helper tests/auto/dbus/qdbusabstractadaptor/qmyserver/qmyserver tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger tests/auto/dbus/qdbusinterface/qmyserver/qmyserver |