From: Jonathan Campbell Date: Thu, 24 Mar 2016 12:21:53 +0000 (-0700) Subject: Merge remote-tracking branch 'upstream/master' X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=06d7ca2f9d2b6a8e784e0338080ceeb7da3621e5;hp=535f618e80aa6546e61907026b2451e123655a5b;p=16.git Merge remote-tracking branch 'upstream/master' --- diff --git a/git_con.fig b/git_con.fig index 265a082e..927bd4df 100755 --- 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 d18873cf..3595a6c6 160000 --- a/src/lib/doslib +++ b/src/lib/doslib @@ -1 +1 @@ -Subproject commit d18873cfeb013751b3f9dacbf942c8efbfa299a5 +Subproject commit 3595a6c60a0b53bf18e2dff8bb62e937e2be769e