Skip to content

Commit

Permalink
Merge branch 'master' into item-pocket
Browse files Browse the repository at this point in the history
  • Loading branch information
MatusGuy authored Nov 7, 2024
2 parents d8639a8 + 34d467c commit 460f906
Show file tree
Hide file tree
Showing 364 changed files with 5,616 additions and 1,665 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ jobs:
--check-level=exhaustive \
--quiet --inline-suppr --language=c++ --error-exitcode=10 \
-j"$(nproc)" --std=c++17 --enable=warning,style \
--suppress=useStlAlgorithm src/
--suppress=useStlAlgorithm -UEMSCRIPTEN src/
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ language.settings.xml
# JetBrains IDE project files
.idea/

# Emacs
*~
\#*\#
.\#*
.dir-locals.el
.projectile

# Windows build dependencies
dependencies*/

Expand Down
Loading

0 comments on commit 460f906

Please sign in to comment.