blob: de857a35363bc865d86e78b59b258780c3e9be93 (
plain)
1
2
3
4
5
6
7
8
9
10
11
|
tree 1561da75afdd61a6ed46afda8a03a71706551e52
parent 4815d36833165a60d7f3168b225d94e0d8f205cb
parent 75f6de2049c6c8210c11751ade762326dddc1f19
author Christian Tismer <ctismer@gmail.com> 1446915405 +0100
committer Christian Tismer <ctismer@gmail.com> 1446915405 +0100
Merge branch 'new_metaobject'
* new_metaobject:
fixing the shiboken tests (renaming effects)
remove metaObject method (done when parsing sources with Q_DOC macro)
|
