From 6730ad4c27d98fa0df3a1cb186cbfef882a139df Mon Sep 17 00:00:00 2001 From: momo5502 Date: Mon, 8 Aug 2016 20:45:16 +0200 Subject: [PATCH] Update zlib --- .gitmodules | 2 +- deps/zlib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 12351544..15d30bd8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "deps/zlib"] path = deps/zlib url = https://github.com/madler/zlib.git - branch = master + branch = develop [submodule "deps/json11"] path = deps/json11 url = https://github.com/dropbox/json11.git diff --git a/deps/zlib b/deps/zlib index 50893291..70a8763b 160000 --- a/deps/zlib +++ b/deps/zlib @@ -1 +1 @@ -Subproject commit 50893291621658f355bc5b4d450a8d06a563053d +Subproject commit 70a8763b7187f2536ce7fe4d399ce9a79c9faf7c