From: Jonathan Campbell Date: Mon, 21 Mar 2016 05:13:38 +0000 (-0700) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=715de3f5b016326fd808300890c3590bf786d32f;hp=81235413d6a56ca849923c4d425e976f6759a799;p=16.git Merge remote-tracking branch 'upstream/master' --- diff --git a/data/aconita.pcx b/data/aconita.pcx new file mode 100755 index 00000000..d38a9fd4 Binary files /dev/null and b/data/aconita.pcx differ diff --git a/git_modu.les b/git_modu.les new file mode 100755 index 00000000..5586d575 --- /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 43602004..ce3e74b0 160000 --- a/src/lib/doslib +++ b/src/lib/doslib @@ -1 +1 @@ -Subproject commit 43602004dc8f1a027ec186d3bf87a808c40083f5 +Subproject commit ce3e74b0e79e54fe9d1bd9df813813bdf2f56bbb