From 9aa809debf44a5b1f125fe3f32162235230eaae5 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 17 Oct 2014 15:07:14 +0200
Subject: [PATCH] update 3rdparty to match master - just adds the merge commit

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 635aaf81d0d..f6d7a519e4d 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 635aaf81d0d97f000c9d4b90fc5a3240d05cf371
+Subproject commit f6d7a519e4dca5189963abb15e5c9858b03bf98d
-- 
GitLab