Merge branch 'master' of https://github.com/BradleySmall/c_quoin (fcaa913a) · Commits · La Fée Verte / c_quoin · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

c_quoin
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

fcaa913a

Commit fcaa913a authored 7 years ago by Small, Bradley

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/BradleySmall/c_quoin

Conflicts:
	src/menu.c
	src/menu.h
	src/pass.c
	src/pass.h

parents a3db1491 0edf2f42

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Makefile 6 additions, 4 deletions

Makefile
src/app_transport.h 2 additions, 2 deletions

src/app_transport.h
src/menu.h 2 additions, 2 deletions

src/menu.h
src/pass.h 4 additions, 4 deletions

src/pass.h
src/term.h 2 additions, 2 deletions

src/term.h
src/trans.h 2 additions, 2 deletions

src/trans.h
src/user.h 2 additions, 2 deletions

src/user.h

with 20 additions and 18 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