[Development] api_changes merged back to master

[Donald Carr]

yetch, and again, sorry Kent

Were I but a beautiful woman, I would lend you a hug to give you the
power to put this turkey down, once and for all.

KO

On Tue, Apr 17, 2012 at 8:36 PM,  <kent.hansen at nokia.com> wrote:
> Hi,
> The qtdeclarative merge (https://codereview.qt-project.org/#change,23550) still hasn't gone through; tests are crashing in the latest attempt.
>
> Modules that depend on qtdeclarative won't be able to merge any changes until the above merge is completed.
>
> Kent
>
> ________________________________________
> From: development-bounces+kent.hansen=nokia.com at qt-project.org [development-bounces+kent.hansen=nokia.com at qt-project.org] on behalf of Knoll Lars (Nokia-MP/Oslo)
> Sent: Tuesday, April 17, 2012 4:52 PM
> To: development at qt-project.org
> Subject: [Development] api_changes merged back to master
>
> Hi everybody,
>
> the merge of api_changes back into master for qtbase finally made it's way
> through the CI system. I'm currently in the process of merging declarative
> back and Kent is staging all the changes required to fix compilation of
> the other modules.
>
> >From now on most changes should go to master. I'll keep api_changes around
> for another little while as there are still some changes in gerrit against
> it, but I would like to empty this queue now and then remove the
> api_changes branch soon.
>
> Cheers,
> Lars
>
> _______________________________________________
> Development mailing list
> Development at qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development
> _______________________________________________
> Development mailing list
> Development at qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development



-- 
-------------------------------
 °v°  Donald Carr
/(_)\ Vaguely Professional Penguin lover
 ^ ^

Cave canem, te necet lingendo
Chasing my own tail; hate to see me leave, love to watch me go