# HG changeset patch
# User eldar_ins@eldar-laptop
# Date 1261525555 -18000
# Node ID 2485419c5c63126b7bfedb61543e21092452c7f9
# Parent  91ed8edd442e4879a5bd792b799a355678c00f7a# Parent  3b79bd4298e82b6b162e37c852e7b95acdf659eb
merge with 299

diff -r 3b79bd4298e8 -r 2485419c5c63 generator/abstractmetalang.cpp
diff -r 3b79bd4298e8 -r 2485419c5c63 generator/dgenerator.cpp
diff -r 3b79bd4298e8 -r 2485419c5c63 generator/typesystem_core.xml
diff -r 3b79bd4298e8 -r 2485419c5c63 generator/typesystem_gui.xml
diff -r 3b79bd4298e8 -r 2485419c5c63 generator/typesystem_phonon.xml
diff -r 3b79bd4298e8 -r 2485419c5c63 generator/typesystem_xmlpatterns.xml
diff -r 3b79bd4298e8 -r 2485419c5c63 qt/qtd/MetaMarshall.d