Merge remote-tracking branch 'upstream/master'

diff --git a/git_con.fig b/git_con.fig
index 265a082eb4b294a4f49a46400f393ed6b8c7031f..927bd4df91ff632c75c4dc1200c5e0fb3ccc9d97 100755 (executable)
--- a/git_con.fig
+++ b/git_con.fig
@@ -4,14 +4,11 @@
        bare = false
        logallrefupdates = true
 [remote "origin"]
-       url = https://github.com/joncampbell123/16.git
+       url = https://github.com/sparky4/16
        fetch = +refs/heads/*:refs/remotes/origin/*
 [branch "master"]
        remote = origin
        merge = refs/heads/master
-[remote "upstream"]
-       url = https://github.com/sparky4/16.git
-       fetch = +refs/heads/*:refs/remotes/upstream/*
 [submodule "src/lib/doslib"]
        url = https://github.com/joncampbell123/doslib.git
 [submodule "src/lib/jsmn"]

diff --git a/src/lib/doslib b/src/lib/doslib
index d18873cfeb013751b3f9dacbf942c8efbfa299a5..3595a6c60a0b53bf18e2dff8bb62e937e2be769e 160000 (submodule)
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit d18873cfeb013751b3f9dacbf942c8efbfa299a5
+Subproject commit 3595a6c60a0b53bf18e2dff8bb62e937e2be769e