diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-19 00:02:16 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-19 00:02:16 +0200 |
commit | 2ba0e25a0c6fee7e2144f1fc8b577f73e1155e6d (patch) | |
tree | 504e526cbb840733a316714c890fb25d1d64eb1c /tools/scripts/git_submodule.py | |
parent | 2c246e60e886b082e7438cf8f68cdc22bc919fd9 (diff) | |
parent | f5ec28285ab7f71d6d75af963ae499603da6630e (diff) | |
download | qtwebengine-2ba0e25a0c6fee7e2144f1fc8b577f73e1155e6d.tar.gz |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I78c25caf30923fc1101b137f9abc3993e3cf0600
Diffstat (limited to 'tools/scripts/git_submodule.py')
-rw-r--r-- | tools/scripts/git_submodule.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/scripts/git_submodule.py b/tools/scripts/git_submodule.py index e5dd9c6cb..93afbacd6 100644 --- a/tools/scripts/git_submodule.py +++ b/tools/scripts/git_submodule.py @@ -46,7 +46,7 @@ import subprocess import sys import version_resolver as resolver -extra_os = ['android', 'mac', 'win'] +extra_os = ['mac', 'win'] def subprocessCall(args): print args |