← Back to branch summary

~mzanetti/unity-api/dashActive

~mzanetti/unity-api/dashActive

Viewing all changes in revision 157.

Committer: Michael Zanetti
Date: 2014-09-19 11:52:50 UTC
mfrom: (155.1.2 unity-api)
Revision ID: michael.zanetti@canonical.com-20140919115250-m7r3lq54ara5mbtg

merge trunk

files modified:
debian/changelog

include/unity/shell/launcher/CMakeLists.txt

include/unity/shell/launcher/LauncherItemInterface.h

include/unity/shell/launcher/LauncherModelInterface.h

test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp

test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h

test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp

test/qmltest/unity/shell/launcher/tst_Launcher.qml

Show diffs side-by-side

added added

removed removed

debian/changelog

include/unity/shell/launcher/CMakeLists.txt

include/unity/shell/launcher/LauncherItemInterface.h

include/unity/shell/launcher/LauncherModelInterface.h

test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp

test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h

test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp

test/qmltest/unity/shell/launcher/tst_Launcher.qml

Older »