Merge remote-tracking branch 'origin/main'

# Conflicts: # arquivos/CMakeLists.txt # arquivos/Menu.c # arquivos/exemplo.c # arquivos/funcoes.c # arquivos/main.c # funcoes/funcoes.h
caio-passos · Dec 15, 2022 · eceef30 · eceef30
2 parents b6b1763 + a09a8c1
commit eceef30
Show file tree

Hide file tree

Showing 40 changed files with 83 additions and 3,296 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/fichaacademia.iml b/.idea/fichaacademia.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/cmake-build-debug/.cmake/api/v1/query/cache-v2 b/cmake-build-debug/.cmake/api/v1/query/cache-v2
diff --git a/cmake-build-debug/.cmake/api/v1/query/cmakeFiles-v1 b/cmake-build-debug/.cmake/api/v1/query/cmakeFiles-v1
diff --git a/cmake-build-debug/.cmake/api/v1/query/codemodel-v2 b/cmake-build-debug/.cmake/api/v1/query/codemodel-v2
diff --git a/cmake-build-debug/.cmake/api/v1/query/toolchains-v1 b/cmake-build-debug/.cmake/api/v1/query/toolchains-v1