[Development] Bad merge resolution in qtbase's second commit

[Sergio Ahumada]

On 09/18/2012 02:05 PM, Thiago Macieira wrote:
>
> Interesting. We're still using 2.2, so it might be a good idea to consider
> upgrading.
>

https://bugreports.qt-project.org/browse/QTQAINFRA-466

https://codereview.qt-project.org/#admin,project,qtqa/gerrit,info

if somebody wants to give it a try, 2.4.2 seems to be the latest stable 
version

-- 
Sergio Ahumada Navea
san at sansano.inf.utfsm.cl