summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qfilesystemwatcher_inotify.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-11-23 19:17:25 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-11-23 19:17:25 +0000
commit746f54c6df0b6c08126b02ddc19e9e3010cb0d2d (patch)
tree0b50efabfdc1ea8acd61521fa6d2234effe3a1a9 /src/corelib/io/qfilesystemwatcher_inotify.cpp
parent550fbf96b06bc9194388ccdae1a9e6116d959599 (diff)
parent1ed7a67a4cef8350103e4ea33b4bbd084f5d4c2d (diff)
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/io/qfilesystemwatcher_inotify.cpp')
0 files changed, 0 insertions, 0 deletions