On 29.02.2012 12:23, ext Matti Airas wrote: >> Secondly I think some merge in the shiboken repository went wrong. >> The following files are in the repository: >> libshiboken/basewrapper.cpp.orig >> libshiboken/basewrapper_p.h.orig > OK, this is awkward. Don't know what happened but I had managed to leave > these in the working set when flattening the repos. I've fixed the issue > in my clone and requested the Qt admins to force push the fixed commit in. > > Thanks a lot for the heads up!
The .orig files have now been removed and the fixed repo force-pushed to gerrit. Unless you have done any major changes to your local copies, it's probably best to re-clone the repository. Sorry for the inconvenience... :-/ Cheers, ma. _______________________________________________ PySide mailing list [email protected] http://lists.qt-project.org/mailman/listinfo/pyside
