summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2012-12-12 22:09:46 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-13 13:52:53 +0100
commitc2bff97edd30d9031112b8d926ccc97a25ae1a9c (patch)
tree5fa6d98f6bd92c721430a73296233ab1b5a0ddec
parent59a003faafe53a155e4a46725ef41b1b7dca4b75 (diff)
sync.profile: Point dependencies to 'refs/heads/dev'
We should test dev branches against dev branches only by default. At some point we should automate the merges from release->stable->dev and/or decide how to handle possible conflicts. This is good enough for the time being. Change-Id: Id328f169004a6cb69078b58801885b00581fee33 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
-rw-r--r--sync.profile2
1 files changed, 1 insertions, 1 deletions
diff --git a/sync.profile b/sync.profile
index 62e92bc..edc6286 100644
--- a/sync.profile
+++ b/sync.profile
@@ -12,5 +12,5 @@
# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
#
%dependencies = (
- "qtbase" => "refs/heads/master",
+ "qtbase" => "refs/heads/dev",
);