summaryrefslogtreecommitdiff
path: root/bin/git-qt-merge-mainlines
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-09-24 10:32:52 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-09-24 12:53:41 +0200
commit03a5e106d395d6a3cfa46fa9b1f60b387e1dece3 (patch)
treefdf2931a1dfe20906815216f5ea9f6c3e68bcdc5 /bin/git-qt-merge-mainlines
parent07592b2c796cf17a8398a68d1e5da00f64292a65 (diff)
downloadqtrepotools-03a5e106d395d6a3cfa46fa9b1f60b387e1dece3.tar.gz
git-qt-merge-mainlines: Add qtandroidextras to the default list
Change-Id: Id82a09c0b99985bf2a750b786f8cd857e82f9603 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'bin/git-qt-merge-mainlines')
-rwxr-xr-xbin/git-qt-merge-mainlines1
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/git-qt-merge-mainlines b/bin/git-qt-merge-mainlines
index 381294c..2074644 100755
--- a/bin/git-qt-merge-mainlines
+++ b/bin/git-qt-merge-mainlines
@@ -18,6 +18,7 @@ import re
DEFAULT_MODULE_LIST = [
'qtactiveqt',
+ 'qtandroidextras',
'qtbase',
'qtconnectivity',
'qtdeclarative',