Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

FUCoin
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

b0a93ca8

"dune/git@git.imp.fu-berlin.de:podlesny/dune-tectonic.git" did not exist on "46b107cabf16422299b98d34619e236a52c6c7e9"

Unverified Commit b0a93ca8 authored 8 years ago by Luca Keidel

Downloads
- Plain Diff

Resolved merge conflict

parents 3047ad67 4c31e8a6

No related branches found

No related tags found

1 merge request!3Preliminary result of the software

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/fucoin/MainRemote.java 7 additions, 56 deletions

src/main/java/fucoin/MainRemote.java
src/main/java/fucoin/gui/WalletGuiControl.java 6 additions, 0 deletions

src/main/java/fucoin/gui/WalletGuiControl.java
src/main/java/fucoin/gui/WalletGuiControlImpl.java 35 additions, 3 deletions

src/main/java/fucoin/gui/WalletGuiControlImpl.java
src/main/java/fucoin/setup/NetworkInterfaceReader.java 37 additions, 0 deletions

src/main/java/fucoin/setup/NetworkInterfaceReader.java
src/main/java/fucoin/setup/SelectableNetworkInterface.java 0 additions, 3 deletions

src/main/java/fucoin/setup/SelectableNetworkInterface.java
src/main/java/fucoin/setup/SetupDialogPanel.java 78 additions, 0 deletions

src/main/java/fucoin/setup/SetupDialogPanel.java
src/main/java/fucoin/wallet/WalletImpl.java 5 additions, 1 deletion

src/main/java/fucoin/wallet/WalletImpl.java

with 168 additions and 63 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