aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/ApiExtractor/merge.xsl
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup pointer and trailing whitespace (omissions)Christian Tismer2019-06-251-8/+8
| | | | | | | | | | | | | | | | | The "Cleanup pointer whitespace" patch was augmented by some C++11 changes. Unfortunately, this was done in the same commit, and so some old whitespace that was removed could re-appear invisibly, since it was in the original version. This fix tries to remove all trailing whitespace and also adds a few " *" corrections that were lost. The "type *" entries in XML files were changed back to "type*". Change-Id: Ic5c945ad64a47455fb15eebdf184b126af5ecd1d Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* move everying into sources/shiboken2 (dev edition)Oswald Buddenhagen2017-05-221-0/+82
in preparation for a subtree merge. this should not be necessary to do in a separate commit, but git is a tad stupid about following history correctly without it.