Merge branch 'dbusvirtual' v0.0.4-alpha
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>
Fri, 12 Aug 2011 09:53:22 +0000 (02:53 -0700)
committerFrederik Gladhorn <frederik.gladhorn@nokia.com>
Fri, 12 Aug 2011 09:53:22 +0000 (02:53 -0700)
commitbf53b17fc0041b3e28a4bfff953545c370ee5c00
treef8244c1ea9f6b82098b20908d53db10b944f4e96
parentcc8512d8bbe85af0f513e5d29f93a4a71a5ba26a
parent75b3c6e31620ac84229684e587ebcfec830fdeec
Merge branch 'dbusvirtual'

By now the branch has become stable enough and has a much better memory foot print.

Conflicts:
examples/simple/mainwindow.cpp
examples/simple/mainwindow.ui
examples/simple/mainwindow.cpp
src/accessible.cpp