rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
rusefi 2020-07-11 14:35:27 -04:00
parent ab3f238bda e8caf8707d
commit bea99f68ca
4 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java_console/.idea/libraries/httpclient.xml
View File

@ -4,6 +4,7 @@
<root url="jar://$PROJECT_DIR$/lib/httpclient.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/httpclient.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/httpmime.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/httpmime.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/httpcore.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/httpcore.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/commons-logging.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/httpclient-javadoc.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/httpclient-javadoc.jar!/" />

1
java_console/build.xml
View File

@ -120,6 +120,7 @@
<zipfileset src="lib/log4j.jar" includes="**/*.class"/> <zipfileset src="lib/log4j.jar" includes="**/*.class"/>
<zipfileset src="lib/jep.jar" includes="**/*.class"/> <zipfileset src="lib/jep.jar" includes="**/*.class"/>
<zipfileset src="lib/httpclient.jar" includes="**/*.class"/> <zipfileset src="lib/httpclient.jar" includes="**/*.class"/>
<zipfileset src="lib/commons-logging.jar" includes="**/*.class"/>
<zipfileset src="lib/httpcore.jar" includes="**/*.class"/> <zipfileset src="lib/httpcore.jar" includes="**/*.class"/>
<zipfileset src="lib/httpmime.jar" includes="**/*.class"/> <zipfileset src="lib/httpmime.jar" includes="**/*.class"/>
<zipfileset src="lib/jaxb-api.jar" includes="**/*.class"/> <zipfileset src="lib/jaxb-api.jar" includes="**/*.class"/>

BIN
java_console/lib/commons-logging.jar Normal file
View File

Binary file not shown.

2
java_console/models/src/main/java/com/rusefi/rusEFIVersion.java
View File

@ -3,6 +3,6 @@ package com.rusefi;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
public class rusEFIVersion { public class rusEFIVersion {
public static final int CONSOLE_VERSION = 20200709; public static final int CONSOLE_VERSION = 20200711;
public static AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A"); public static AtomicReference<String> firmwareVersion = new AtomicReference<>("N/A");
} }