Merge pull request 'sql' (#2) from sqf_branch into develop

2 months ago · 363831b845
parent f20b76b738 7b468e720c
commit 363831b845
10 changed files with 4 additions and 1 deletions
--- a/doc/README.md
+++ b/doc/README.md
@ -3,7 +3,6 @@
 src/
 ├─ Main.java
 ├─ controller/
-│   ├─ AssignController.java
 │   └─ FunctionController.java
 ├─ model/
 │   ├─ Login.java
@ -13,6 +12,7 @@ src/
 │   ├─ LoadFile.java
 │   ├─ Save.java
 │   ├─ Create.java
+│   ├─ ExpressionEvaluator.java
 │   └─ Paper.java
 └─ view/
    ├─ LoginFrame.java
@ -21,6 +21,9 @@ src/
    ├─ ExamSetupFrame.java
    ├─ ExamFrame.java
    └─ ResultFrame.java
+lib/
+├─ Main.java
+└─ view/

 ---

--- a/lib/javax.annotation.jar
+++ b/lib/javax.annotation.jar
--- a/lib/javax.ejb.jar
+++ b/lib/javax.ejb.jar
--- a/lib/javax.jms.jar
+++ b/lib/javax.jms.jar
--- a/lib/javax.persistence.jar
+++ b/lib/javax.persistence.jar
--- a/lib/javax.resource.jar
+++ b/lib/javax.resource.jar
--- a/lib/javax.servlet.jar
+++ b/lib/javax.servlet.jar
--- a/lib/javax.servlet.jsp.jar
+++ b/lib/javax.servlet.jsp.jar
--- a/lib/javax.servlet.jsp.jstl.jar
+++ b/lib/javax.servlet.jsp.jstl.jar
--- a/lib/javax.transaction.jar
+++ b/lib/javax.transaction.jar