From 980b70e3d6025c55d656c5f94bb006ba79ccf5db Mon Sep 17 00:00:00 2001 From: Sandeep Mistry Date: Wed, 23 Jan 2019 10:46:28 -0500 Subject: [PATCH] Upgrade jtouchbar to 1.0.0 --- app/.classpath | 2 +- ...80827.120213-5.jar => jtouchbar-1.0.0.jar} | Bin 324395 -> 324680 bytes build/windows/launcher/config.xml | 2 +- build/windows/launcher/config_debug.xml | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename app/lib/{jtouchbar-0.2.0-20180827.120213-5.jar => jtouchbar-1.0.0.jar} (94%) diff --git a/app/.classpath b/app/.classpath index 0b205ab3f..564649ea6 100644 --- a/app/.classpath +++ b/app/.classpath @@ -52,6 +52,6 @@ - + diff --git a/app/lib/jtouchbar-0.2.0-20180827.120213-5.jar b/app/lib/jtouchbar-1.0.0.jar similarity index 94% rename from app/lib/jtouchbar-0.2.0-20180827.120213-5.jar rename to app/lib/jtouchbar-1.0.0.jar index eb3902a656c0fbd876e6b7c6f1e8387b4aad7a1b..a6bf9a091a6cb8ee6695f460b6eaeacf5ab2a035 100644 GIT binary patch delta 13806 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 delta 13388 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 F{vR~|1n&R< diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml index fb71d274a..654304f83 100644 --- a/build/windows/launcher/config.xml +++ b/build/windows/launcher/config.xml @@ -42,7 +42,7 @@ %EXEDIR%/lib/jackson-module-mrbean-2.9.5.jar %EXEDIR%/lib/java-semver-0.8.0.jar %EXEDIR%/lib/jmdns-3.5.3.jar - %EXEDIR%/lib/jtouchbar-0.2.0-20180827.120213-5.jar + %EXEDIR%/lib/jtouchbar-1.0.0.jar %EXEDIR%/lib/slf4j-simple-1.7.22.jar %EXEDIR%/lib/slf4j-api-1.7.22.jar %EXEDIR%/lib/jna-4.2.2.jar diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml index 2c407f428..86fd9560d 100644 --- a/build/windows/launcher/config_debug.xml +++ b/build/windows/launcher/config_debug.xml @@ -42,7 +42,7 @@ %EXEDIR%/lib/jackson-module-mrbean-2.9.5.jar %EXEDIR%/lib/java-semver-0.8.0.jar %EXEDIR%/lib/jmdns-3.5.3.jar - %EXEDIR%/lib/jtouchbar-0.2.0-20180827.120213-5.jar + %EXEDIR%/lib/jtouchbar-1.0.0.jar %EXEDIR%/lib/slf4j-simple-1.7.22.jar %EXEDIR%/lib/slf4j-api-1.7.22.jar %EXEDIR%/lib/jna-4.2.2.jar