Merge branch 'master' of gitorious.org:qt-labs/qml-presentation-system
authorGunnar Sletta <gunnar.sletta@digia.com>
Sat, 3 Nov 2012 18:44:49 +0000 (19:44 +0100)
committerGunnar Sletta <gunnar.sletta@digia.com>
Sat, 3 Nov 2012 18:44:49 +0000 (19:44 +0100)
commit78f0e8102a30fed8eb5c6f34c3670b053950e34c
tree02fc574a92aac0b8946beec6fbadc3a86813e139
parent52724f4b6300d42d8f7896adccf28411a7655b6d
parent766a43ca4190b32617e1361548d028271263378a
Merge branch 'master' of gitorious.org:qt-labs/qml-presentation-system