Merge branch 'master' of git://labs.trolltech.com/qtscriptgeneratormaster
commit3bd49141f8f2bd07522967e4b4be54f3add1509d
authorIan Alexander Monroe <imonroe@kde.org>
Tue, 3 Feb 2009 22:19:31 +0000 (3 16:19 -0600)
committerIan Alexander Monroe <imonroe@kde.org>
Tue, 3 Feb 2009 22:19:31 +0000 (3 16:19 -0600)
tree41be81078bcdf56c7d5b598f6e2bc7b8fe7b2dc0
parent0d080d13e841c2034df9e8f175f9c6cde98602bd
parent9e1df82c891d6d844bbac6f76a84c70cb3c88451
Merge branch 'master' of git://labs.trolltech.com/qtscriptgenerator
generator/typesystem.cpp
generator/typesystem_core-common.xml
generator/typesystem_core.xml