diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-22 11:08:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-22 21:19:57 +0200 |
| commit | 28628a5d5e6c55512759ceafc644aa31e444b781 (patch) | |
| tree | 221d1ab0995afe0d441f1ddb433aee985f6d41ea /src/corelib/io/qurltlds_p.h.INFO | |
| parent | cbb2ba23e203374132e4b134b1c8f1a3626d2378 (diff) | |
| parent | 686c44a69b13f6e884dd2b6d9991f4cd94597c5a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/eglfs/qeglfshooks.cpp
Change-Id: I483f0dbd876943b184803f0fe65a0c686ad75db2
Diffstat (limited to 'src/corelib/io/qurltlds_p.h.INFO')
| -rw-r--r-- | src/corelib/io/qurltlds_p.h.INFO | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qurltlds_p.h.INFO b/src/corelib/io/qurltlds_p.h.INFO index 7e5c0bb19f..3f3d808a21 100644 --- a/src/corelib/io/qurltlds_p.h.INFO +++ b/src/corelib/io/qurltlds_p.h.INFO @@ -9,8 +9,8 @@ Those arrays in qurltlds_p.h are derived from the Public Suffix List ([2]), which was originally provided by Jo Hermans <jo.hermans@gmail.com>. -The file qurltlds_p.h was last generated Wednesday, -February 11th 14:36 2015. +The file qurltlds_p.h was last generated Thursday, +October 20th 8:40 2016. ---- [1] list: http://mxr.mozilla.org/mozilla-central/source/netwerk/dns/effective_tld_names.dat?raw=1 |