diff options
author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-06-09 13:59:07 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-06-09 13:59:07 +0200 |
commit | 0963be63ce741ef6c7585358c3f3b1cb806b66e8 (patch) | |
tree | 6f4964c196b8a52cb15e9efc0388b6a549574460 /src/3rdparty/sha3 | |
parent | 9e6a1351823b3ee3d7e380248f6ef42ff383b014 (diff) | |
parent | eacfbbf64ef90dad8c5cb6b2c812ad64c1100779 (diff) |
Merge remote-tracking branch 'qt/dev' into dev-highdpi
Conflicts:
src/gui/kernel/qsimpledrag.cpp
src/gui/kernel/qwindowsysteminterface.cpp
src/gui/kernel/qwindowsysteminterface_p.h
src/plugins/platforms/xcb/qxcbwindow.cpp
Change-Id: Icd887552ade61d6a2b2527383970f7145aa00faf
Diffstat (limited to 'src/3rdparty/sha3')
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakF-1600-32-rvk.macros | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakF-1600-32.macros | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakF-1600-64.macros | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakF-1600-int-set.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakF-1600-interface.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakF-1600-opt32-settings.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakF-1600-opt32.c | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakF-1600-opt64-settings.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakF-1600-unrolling.macros | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakNISTInterface.c | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakNISTInterface.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakSponge.c | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/KeccakSponge.h | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/3rdparty/sha3/brg_endian.h | 0 |
14 files changed, 0 insertions, 0 deletions
diff --git a/src/3rdparty/sha3/KeccakF-1600-32-rvk.macros b/src/3rdparty/sha3/KeccakF-1600-32-rvk.macros index c0c9029873..c0c9029873 100755..100644 --- a/src/3rdparty/sha3/KeccakF-1600-32-rvk.macros +++ b/src/3rdparty/sha3/KeccakF-1600-32-rvk.macros diff --git a/src/3rdparty/sha3/KeccakF-1600-32.macros b/src/3rdparty/sha3/KeccakF-1600-32.macros index 9ade600067..9ade600067 100755..100644 --- a/src/3rdparty/sha3/KeccakF-1600-32.macros +++ b/src/3rdparty/sha3/KeccakF-1600-32.macros diff --git a/src/3rdparty/sha3/KeccakF-1600-64.macros b/src/3rdparty/sha3/KeccakF-1600-64.macros index 0c20bca40f..0c20bca40f 100755..100644 --- a/src/3rdparty/sha3/KeccakF-1600-64.macros +++ b/src/3rdparty/sha3/KeccakF-1600-64.macros diff --git a/src/3rdparty/sha3/KeccakF-1600-int-set.h b/src/3rdparty/sha3/KeccakF-1600-int-set.h index 0ed1d802e3..0ed1d802e3 100755..100644 --- a/src/3rdparty/sha3/KeccakF-1600-int-set.h +++ b/src/3rdparty/sha3/KeccakF-1600-int-set.h diff --git a/src/3rdparty/sha3/KeccakF-1600-interface.h b/src/3rdparty/sha3/KeccakF-1600-interface.h index ce2710eeb2..ce2710eeb2 100755..100644 --- a/src/3rdparty/sha3/KeccakF-1600-interface.h +++ b/src/3rdparty/sha3/KeccakF-1600-interface.h diff --git a/src/3rdparty/sha3/KeccakF-1600-opt32-settings.h b/src/3rdparty/sha3/KeccakF-1600-opt32-settings.h index b135918ca9..b135918ca9 100755..100644 --- a/src/3rdparty/sha3/KeccakF-1600-opt32-settings.h +++ b/src/3rdparty/sha3/KeccakF-1600-opt32-settings.h diff --git a/src/3rdparty/sha3/KeccakF-1600-opt32.c b/src/3rdparty/sha3/KeccakF-1600-opt32.c index 4e32dca9cb..4e32dca9cb 100755..100644 --- a/src/3rdparty/sha3/KeccakF-1600-opt32.c +++ b/src/3rdparty/sha3/KeccakF-1600-opt32.c diff --git a/src/3rdparty/sha3/KeccakF-1600-opt64-settings.h b/src/3rdparty/sha3/KeccakF-1600-opt64-settings.h index 8f16ada636..8f16ada636 100755..100644 --- a/src/3rdparty/sha3/KeccakF-1600-opt64-settings.h +++ b/src/3rdparty/sha3/KeccakF-1600-opt64-settings.h diff --git a/src/3rdparty/sha3/KeccakF-1600-unrolling.macros b/src/3rdparty/sha3/KeccakF-1600-unrolling.macros index 83c694ca48..83c694ca48 100755..100644 --- a/src/3rdparty/sha3/KeccakF-1600-unrolling.macros +++ b/src/3rdparty/sha3/KeccakF-1600-unrolling.macros diff --git a/src/3rdparty/sha3/KeccakNISTInterface.c b/src/3rdparty/sha3/KeccakNISTInterface.c index e530a11db5..e530a11db5 100755..100644 --- a/src/3rdparty/sha3/KeccakNISTInterface.c +++ b/src/3rdparty/sha3/KeccakNISTInterface.c diff --git a/src/3rdparty/sha3/KeccakNISTInterface.h b/src/3rdparty/sha3/KeccakNISTInterface.h index cd85f24aa7..cd85f24aa7 100755..100644 --- a/src/3rdparty/sha3/KeccakNISTInterface.h +++ b/src/3rdparty/sha3/KeccakNISTInterface.h diff --git a/src/3rdparty/sha3/KeccakSponge.c b/src/3rdparty/sha3/KeccakSponge.c index 6f3da95dbb..6f3da95dbb 100755..100644 --- a/src/3rdparty/sha3/KeccakSponge.c +++ b/src/3rdparty/sha3/KeccakSponge.c diff --git a/src/3rdparty/sha3/KeccakSponge.h b/src/3rdparty/sha3/KeccakSponge.h index 8bb11a8a1d..8bb11a8a1d 100755..100644 --- a/src/3rdparty/sha3/KeccakSponge.h +++ b/src/3rdparty/sha3/KeccakSponge.h diff --git a/src/3rdparty/sha3/brg_endian.h b/src/3rdparty/sha3/brg_endian.h index 7226eb3bec..7226eb3bec 100755..100644 --- a/src/3rdparty/sha3/brg_endian.h +++ b/src/3rdparty/sha3/brg_endian.h |