Viewing all changes in revision 2781.
- Committer: Lukáš Tinkl
- Date: 2017-01-26 12:13:17 UTC
- mfrom: (2749.1.49 unity8)
- Revision ID: lukas.tinkl@canonical.com-20170126121317-qms39s9pikclidbe
merge trunk, fix conflicts
- files added:
- plugins/LightDM/PromptsModel.cpp
- tests/mocks/LightDMController
- files removed:
- qml/Launcher/graphics/launcher-app-focus-ring.svg
- tests/mocks/LightDM
- tests/mocks/LightDM/IntegratedLightDM
- tests/mocks/LightDM/IntegratedLightDM/QLightDM
- files renamed:
- tests/mocks/LightDM/IntegratedLightDM/liblightdm/ => tests/mocks/liblightdm/
- tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp => tests/mocks/liblightdm/MockGreeter.cpp
- tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h => tests/mocks/liblightdm/MockGreeter.h
- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cpp => tests/mocks/liblightdm/MockSessionsModel.cpp
- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModel.h => tests/mocks/liblightdm/MockSessionsModel.h
- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpp => tests/mocks/liblightdm/MockUsersModel.cpp
- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModel.h => tests/mocks/liblightdm/MockUsersModel.h
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
qml/Launcher/graphics/launcher-app-focus-ring.svg
