Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-jams
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Model registry
- Incidents
- Model experiments

Snippets Groups Projects

919b6010

Commit 919b6010 authored 4 years ago by William Enright

Downloads
- Patches
- Plain Diff

merge resolve + some minor adjustments

parent ceb42a11

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

jams-launcher/pom.xml 2 additions, 0 deletions

jams-launcher/pom.xml
jams-launcher/src/main/java/launcher/AppStarter.java 29 additions, 187 deletions

jams-launcher/src/main/java/launcher/AppStarter.java
updater/pom.xml 1 addition, 18 deletions

updater/pom.xml
updater/src/main/java/net/jami/jams/updater/JAMSUpdater.java 20 additions, 3 deletions

updater/src/main/java/net/jami/jams/updater/JAMSUpdater.java
updater/src/main/java/net/jami/jams/updater/UpdateCheckTask.java 13 additions, 7 deletions

.../src/main/java/net/jami/jams/updater/UpdateCheckTask.java
updater/src/main/java/net/jami/jams/updater/UpdateDaemon.java 5 additions, 4 deletions

...ter/src/main/java/net/jami/jams/updater/UpdateDaemon.java
updater/src/main/java/net/jami/jams/updater/UpdateDownloader.java 10 additions, 119 deletions

...src/main/java/net/jami/jams/updater/UpdateDownloader.java

with 80 additions and 338 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