diff --git a/third-party/discord-rpc/.clang-format b/third-party/discord-rpc/.clang-format index 1be83906c78..e8a5e85ad46 100644 --- a/third-party/discord-rpc/.clang-format +++ b/third-party/discord-rpc/.clang-format @@ -34,7 +34,6 @@ DerivePointerAlignment: false DisableFormat: false FixNamespaceComments: true ForEachMacros: [] -IndentCaseLabels: false IncludeCategories: - Regex: '^("|<)stdafx\.h(pp)?("|>)' Priority: -1 diff --git a/vendor.yaml b/vendor.yaml index 11d64a84335..a28124ba66e 100644 --- a/vendor.yaml +++ b/vendor.yaml @@ -4,6 +4,8 @@ third-party/zydis: sha: 562a7c1e5f2c5017ea882ad0aa3360c465a3eb8f third-party/discord-rpc: sha: 963aa9f3e5ce81a4682c6ca3d136cddda614db33 + modifications: + - "PR #3039 - Removes duplicate key in .clang-format" third-party/fpng: sha: bfe5f9c69e93b99b31268c10db8e645c9125a07f modifications: @@ -41,4 +43,4 @@ third-party/libtinyfiledialogs: - https://github.com/btzy/nativefiledialog-extended (only file dialog support though!) third-party/sse2neon: git: https://github.com/DLTcollab/sse2neon/commit/2eede22be8c5922e44616260c5eab728e3c5e26f - license: MIT \ No newline at end of file + license: MIT