diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /gfx/angle/src/tests/third_party/gpu_test_expectations/HowToMakeChanges.md | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-2018.07.18.tar UXP-2018.07.18.tar.gz UXP-2018.07.18.tar.lz UXP-2018.07.18.tar.xz UXP-2018.07.18.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'gfx/angle/src/tests/third_party/gpu_test_expectations/HowToMakeChanges.md')
| -rwxr-xr-x | gfx/angle/src/tests/third_party/gpu_test_expectations/HowToMakeChanges.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gfx/angle/src/tests/third_party/gpu_test_expectations/HowToMakeChanges.md b/gfx/angle/src/tests/third_party/gpu_test_expectations/HowToMakeChanges.md index 190a3e9c3..7817d0a50 100755 --- a/gfx/angle/src/tests/third_party/gpu_test_expectations/HowToMakeChanges.md +++ b/gfx/angle/src/tests/third_party/gpu_test_expectations/HowToMakeChanges.md @@ -1,4 +1,4 @@ -Because the ```gpu_test_expectations``` directory is based on parts of Chromium's ```gpu/config``` +Because the ```gpu_test_expectations``` directory is based on parts of Chromium's ```gpu/config`` directory, we want to keep a patch of the changes added to make it compile with ANGLE. This will allow us to merge Chromium changes easily in our ```gpu_test_expectations```. |