diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:40:36 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:40:36 +0200 |
| commit | 96adb952c82fd70c29f0c3665f5d111003b54ed9 (patch) | |
| tree | e73167bea05b27aa0c156946e98442c9c893260d | |
| parent | a2db9407b8dd22c1ad3eff4df584f2d984b203d1 (diff) | |
| parent | 587e64025f77242cc1f2e756346f24e810595513 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I304d68e33d4d54dd803163363c36d69f4ab4a5aa
| -rw-r--r-- | sync.profile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sync.profile b/sync.profile index edc6286..78706bf 100644 --- a/sync.profile +++ b/sync.profile @@ -10,7 +10,8 @@ # Each of the module version specifiers can take one of the following values: # - A specific Git revision. # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) +# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch) # %dependencies = ( - "qtbase" => "refs/heads/dev", + "qtbase" => "", ); |