Merged the dbusmenu2 branch
authorAurelien Gateau <aurelien.gateau@canonical.com>
Thu, 24 Feb 2011 13:05:40 +0000 (14:05 +0100)
committerAurélien Gâteau <aurelien.gateau@canonical.com>
Thu, 24 Feb 2011 16:22:22 +0000 (17:22 +0100)
commit4dcb33bfe3a97722a85756a22983d520a79300a5
tree6d13d20455aa3cbdc4510417ea28fb43a3729a5b
parentac3af70fae90512eb1090e543932c1dc71cc5c84
Merged the dbusmenu2 branch

bzr-revid: aurelien.gateau@canonical.com-20110224130540-a2yqzj7k981y1auu
15 files changed:
CMakeLists.txt
src/CMakeLists.txt
src/com.canonical.dbusmenu.xml
src/dbusmenuexporter.cpp
src/dbusmenuexporterdbus_p.cpp
src/dbusmenuexporterdbus_p.h
src/dbusmenuexporterprivate_p.h
src/dbusmenuimporter.cpp
src/dbusmenuimporter.h
src/dbusmenuitem_p.cpp [deleted file]
src/dbusmenuitem_p.h [deleted file]
src/dbusmenutypes_p.cpp [new file with mode: 0644]
src/dbusmenutypes_p.h [new file with mode: 0644]
tests/dbusmenuexportertest.cpp
tests/testutils.h