Skip to content

Commit a01fca5

Browse files
committed
Merge branch 'main' of github.com:github/codeql into python-regex-parsing-consistency-checks
To fix conflicts
2 parents 13c5857 + 05b45da commit a01fca5

File tree

2,427 files changed

+35437
-8315
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,427 files changed

+35437
-8315
lines changed

.codeqlmanifest.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{ "provide": [ "*/ql/src/qlpack.yml",
2+
"*/ql/lib/qlpack.yml",
23
"*/ql/test/qlpack.yml",
34
"cpp/ql/test/query-tests/Security/CWE/CWE-190/semmle/tainted/qlpack.yml",
45
"*/ql/examples/qlpack.yml",

config/identical-files.json

Lines changed: 188 additions & 188 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 0 deletions
Lines changed: 2 additions & 0 deletions
Lines changed: 2 additions & 0 deletions
Lines changed: 2 additions & 0 deletions
Lines changed: 2 additions & 0 deletions

cpp/ql/examples/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
name: codeql-cpp-examples
22
version: 0.0.0
3-
libraryPathDependencies: codeql-cpp
3+
libraryPathDependencies: codeql/cpp-all
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)