Merge remote-tracking branch 'upstream/master'

diff --git a/data/aconita.pcx b/data/aconita.pcx
new file mode 100755 (executable)
index 0000000..d38a9fd
Binary files /dev/null and b/data/aconita.pcx differ

diff --git a/git_modu.les b/git_modu.les
new file mode 100755 (executable)
index 0000000..5586d57
--- /dev/null
+++ b/git_modu.les
@@ -0,0 +1,7 @@
+[submodule "src/lib/doslib"]
+        path = src/lib/doslib
+        url = https://github.com/joncampbell123/doslib.git
+
+[submodule "src/lib/jsmn"]
+       path = src/lib/jsmn
+       url = https://github.com/zserge/jsmn.git

diff --git a/src/lib/doslib b/src/lib/doslib
index 43602004dc8f1a027ec186d3bf87a808c40083f5..ce3e74b0e79e54fe9d1bd9df813813bdf2f56bbb 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 43602004dc8f1a027ec186d3bf87a808c40083f5
+Subproject commit ce3e74b0e79e54fe9d1bd9df813813bdf2f56bbb