summaryrefslogtreecommitdiff
path: root/javaSE
diff options
context:
space:
mode:
authorJulian Kast <julian@livio.com>2021-09-30 16:33:41 -0400
committerJulian Kast <julian@livio.com>2021-09-30 16:33:41 -0400
commitd65d18e709031a6469689ab0bda54e458b79a2e5 (patch)
treeabd4ff9d06acc7a6fabded22a33004e3c6a4d6bf /javaSE
parente55f735c735d96b53ee8fa098f6c8cca0d13c38d (diff)
parent3243c51ce4ec3a0c765e9d56e762181d88cf8f6c (diff)
downloadsdl_android-d65d18e709031a6469689ab0bda54e458b79a2e5.tar.gz
Merge branch 'develop' into bugfix/issue_1736_multi_file_uploadbugfix/issue_1736_multi_file_upload
Diffstat (limited to 'javaSE')
-rw-r--r--javaSE/javaSE/libs/TaskMaster-0.5.jarbin17590 -> 0 bytes
-rw-r--r--javaSE/javaSE/libs/Taskmaster-0.6.jarbin0 -> 17636 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/javaSE/javaSE/libs/TaskMaster-0.5.jar b/javaSE/javaSE/libs/TaskMaster-0.5.jar
deleted file mode 100644
index a7881051b..000000000
--- a/javaSE/javaSE/libs/TaskMaster-0.5.jar
+++ /dev/null
Binary files differ
diff --git a/javaSE/javaSE/libs/Taskmaster-0.6.jar b/javaSE/javaSE/libs/Taskmaster-0.6.jar
new file mode 100644
index 000000000..8f249d0f7
--- /dev/null
+++ b/javaSE/javaSE/libs/Taskmaster-0.6.jar
Binary files differ