Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
bzrtp
Repository
bzrtp
include
cryptoUtils.h
Find file
Blame
History
Permalink
Merge branch 'master' into zrtphash
· 43eef42c
johan
authored
Mar 30, 2016
Conflicts: include/cryptoWrapper.h src/bzrtp.c src/zidCache.c
43eef42c