summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-08-03 02:40:28 +0200
committerLioncash <mathew1800@gmail.com>2020-08-03 02:55:54 +0200
commit0105368cc122c8aabfd60ebda3498c7666aef29c (patch)
treecd00f1ab6a31ea154b2314ac7a36ec0f49dd87d4
parentMerge pull request #4437 from lioncash/ptr (diff)
downloadyuzu-0105368cc122c8aabfd60ebda3498c7666aef29c.tar
yuzu-0105368cc122c8aabfd60ebda3498c7666aef29c.tar.gz
yuzu-0105368cc122c8aabfd60ebda3498c7666aef29c.tar.bz2
yuzu-0105368cc122c8aabfd60ebda3498c7666aef29c.tar.lz
yuzu-0105368cc122c8aabfd60ebda3498c7666aef29c.tar.xz
yuzu-0105368cc122c8aabfd60ebda3498c7666aef29c.tar.zst
yuzu-0105368cc122c8aabfd60ebda3498c7666aef29c.zip
Diffstat (limited to '')
-rw-r--r--.ci/scripts/format/script.sh2
-rwxr-xr-x.travis/clang-format/script.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh
index 5ab828d5e..991fe1552 100644
--- a/.ci/scripts/format/script.sh
+++ b/.ci/scripts/format/script.sh
@@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dis
fi
# Default clang-format points to default 3.5 version one
-CLANG_FORMAT=clang-format-6.0
+CLANG_FORMAT=clang-format-10.0
$CLANG_FORMAT --version
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
diff --git a/.travis/clang-format/script.sh b/.travis/clang-format/script.sh
index 3eff6322f..56a785fe0 100755
--- a/.travis/clang-format/script.sh
+++ b/.travis/clang-format/script.sh
@@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis*
fi
# Default clang-format points to default 3.5 version one
-CLANG_FORMAT=clang-format-6.0
+CLANG_FORMAT=clang-format-10.0
$CLANG_FORMAT --version
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then