From e3345e6cb10566c89b272b106c48deeb0f13b5fa Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sahumada@blackberry.com>
Date: Mon, 24 Feb 2014 23:43:24 +0100
Subject: [PATCH] git-qt-merge-mainlines: Add qtwebsockets to the default list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I118f57de2210bf361ec24d8fb32ca18f753a4c59
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
---
 bin/git-qt-merge-mainlines | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/git-qt-merge-mainlines b/bin/git-qt-merge-mainlines
index 91ed882..eafa3e7 100755
--- a/bin/git-qt-merge-mainlines
+++ b/bin/git-qt-merge-mainlines
@@ -38,6 +38,7 @@ DEFAULT_MODULE_LIST = [
     'qttools',
     'qtwebkit',
     'qtwebkit-examples',
+    'qtwebsockets',
     'qtwinextras',
     'qtxmlpatterns',
     'qtx11extras',
-- 
GitLab