diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-08 01:00:59 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-08 01:01:00 +0100 |
| commit | f8c5c1356465f503e1a8357ceff01bb956d51c9e (patch) | |
| tree | 36b5bc1c2d5767b3eee0820c70b91fdfc57287b3 /src/3rdparty | |
| parent | eda28621f6c1a68774719f382be53ec109123b18 (diff) | |
| parent | 153726bc167406414f589f72bea76c3229cfa815 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ied1194730e75a6f30839bbf5429aa2699230288e
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/angle/id/commit.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/angle/id/commit.h b/src/3rdparty/angle/id/commit.h index 4c89a657c5..d5446432f7 100644 --- a/src/3rdparty/angle/id/commit.h +++ b/src/3rdparty/angle/id/commit.h @@ -7,8 +7,8 @@ // This is a default commit hash header, when git is not available. // -#define ANGLE_COMMIT_HASH "unknown hash" +#define ANGLE_COMMIT_HASH "57ea533f79a7" #define ANGLE_COMMIT_HASH_SIZE 12 -#define ANGLE_COMMIT_DATE "unknown date" +#define ANGLE_COMMIT_DATE "2017-11-22 14:04:48 -0800" #define ANGLE_DISABLE_PROGRAM_BINARY_LOAD |