Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

81012406

Commit 81012406 authored 13 years ago by akwizgran

Downloads
- Plain Diff

Merge branch 'refs/heads/master' of...

Merge branch 'refs/heads/master' of ssh://akwizgran@briar.git.sourceforge.net/gitroot/briar/prototype

parents 85e32703 ef6f6142

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

components/net/sf/briar/plugins/bluetooth/AbstractListener.java 1 addition, 1 deletion

...ents/net/sf/briar/plugins/bluetooth/AbstractListener.java
components/net/sf/briar/plugins/socket/LanSocketPlugin.java 3 additions, 39 deletions

components/net/sf/briar/plugins/socket/LanSocketPlugin.java
components/net/sf/briar/plugins/socket/SimpleSocketPlugin.java 7 additions, 5 deletions

...nents/net/sf/briar/plugins/socket/SimpleSocketPlugin.java

with 11 additions and 45 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