Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Caco Project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

fc1da369

Commit fc1da369 authored 2 years ago by bfsc19

Downloads
- Plain Diff

Merge branch '9-juncao-de-arquivos-e-mensagens' into 'main'

Resolve "junção de arquivos e mensagens"

Closes #9

See merge request !11

parents df539f62 c9b0c072

Branches

Tags

1 merge request!11Resolve "junção de arquivos e mensagens"

Changes 17

Show whitespace changes

Inline Side-by-side

Showing

.clang-format 12 additions, 12 deletions

.clang-format
example.txt 0 additions, 0 deletions

example.txt
fileLocal2 0 additions, 0 deletions

fileLocal2
foto.jpg 0 additions, 0 deletions

foto.jpg
headers/client.h 98 additions, 91 deletions

headers/client.h
headers/conexao.h 3 additions, 7 deletions

headers/conexao.h
headers/crc8.h 1 addition, 1 deletion

headers/crc8.h
headers/macros.h 9 additions, 8 deletions

headers/macros.h
headers/server.h 251 additions, 76 deletions

headers/server.h
received/foto.jpg 0 additions, 0 deletions

received/foto.jpg
received/saida.txt 0 additions, 0 deletions

received/saida.txt
received/texto.txt 35 additions, 0 deletions

received/texto.txt
saida.txt 0 additions, 0 deletions

saida.txt
src/crc8.cpp 12 additions, 17 deletions

src/crc8.cpp
src/exemplo.cpp 31 additions, 37 deletions

src/exemplo.cpp
texto.txt 35 additions, 0 deletions

texto.txt
todo.txt 2 additions, 2 deletions

todo.txt

with 489 additions and 251 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment