summaryrefslogtreecommitdiffstats
path: root/sync.profile
Commit message (Collapse)AuthorAgeFilesLines
* sync.profile: Point dependencies to 'refs/heads/dev'Sergio Ahumada2012-12-141-1/+1
| | | | | | | | | | | 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: Ib08372b619eda3a1faf382f2fe44c3acc88f9e1f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* sync.profile: Point dependencies to 'refs/heads/stable'Sergio Ahumada2012-12-041-1/+1
| | | | | | | | | | | | We should test stable branches against stable branches only. At some point we should automate the merges from dev->stable->release and decide how to handle possible merge conflicts. This is good enough for the time being. Change-Id: I42f68dd5f073a466cecbe9d811a0152af7256895 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* clean upOswald Buddenhagen2012-08-141-10/+0
| | | | | | | there are no qt modules here, so these lines will never be used Change-Id: I85930c993a8befc9607dc1f792074da42334e0ad Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Long live the qtimageformats moduleKent Hansen2012-01-251-0/+19
This module contains plugins for image formats that aren't part of the "core" (qtbase) offering, starting with mng. Task-number: QTBUG-21869 Change-Id: I85e51ed6f84c07419b1676f9def234c36f10141f Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: aavit <qt_aavit@ovi.com>