diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-02-24 23:43:24 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-02-25 10:57:27 +0100 |
| commit | e3345e6cb10566c89b272b106c48deeb0f13b5fa (patch) | |
| tree | b2e53db5514768b46c34c0a4254c87f1e1494ad4 /bin/git-qt-merge-mainlines | |
| parent | 9a3e34923c922a141fa0a0f835aa1acf4a02cd07 (diff) | |
| download | qtrepotools-e3345e6cb10566c89b272b106c48deeb0f13b5fa.tar.gz | |
git-qt-merge-mainlines: Add qtwebsockets to the default list
Change-Id: I118f57de2210bf361ec24d8fb32ca18f753a4c59
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'bin/git-qt-merge-mainlines')
| -rwxr-xr-x | bin/git-qt-merge-mainlines | 1 |
1 files changed, 1 insertions, 0 deletions
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', |