On quinta-feira, 4 de outubro de 2012 13.38.46, Stephen Kelly wrote: > git merge v4.8.4
Better yet: git merge -s ours v4.8.4 No conflicts. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Development mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/development
