-
- Downloads
Merge remote-tracking branch 'origin/Eilerts_branch' into Eilerts_branch
# Conflicts: # src/main/java/com/application/GUI/LineChartFunctionality.java # target/classes/com/application/DB/DB.class # target/classes/com/application/GUI/LineChartFunctionality.class
Showing
- src/main/java/com/application/DB/Constants.java 4 additions, 1 deletionsrc/main/java/com/application/DB/Constants.java
- src/main/java/com/application/DB/DB.java 12 additions, 0 deletionssrc/main/java/com/application/DB/DB.java
- src/main/java/com/application/GUI/OutputPopUpWindow.java 8 additions, 0 deletionssrc/main/java/com/application/GUI/OutputPopUpWindow.java
- src/main/resources/com.application/DataProcessing/NonlinearRegression.py 3 additions, 0 deletions...ces/com.application/DataProcessing/NonlinearRegression.py
- target/classes/com.application/DataProcessing/NonlinearRegression.py 3 additions, 0 deletions...ses/com.application/DataProcessing/NonlinearRegression.py
- target/classes/com/application/DB/Constants.class 0 additions, 0 deletionstarget/classes/com/application/DB/Constants.class
- target/classes/com/application/GUI/OutputPopUpWindow.class 0 additions, 0 deletionstarget/classes/com/application/GUI/OutputPopUpWindow.class
Loading
Please register or sign in to comment