Skip to content
GitLab
Explore
Sign in
This is an archived project. Repository and other project resources are read-only.
Unmaintained
KDE Workspace
Repository
kde-workspace
ksmserver
screenlocker
ksldapp.cpp
Find file
Blame
History
Permalink
Merge branch 'KDE/4.11'
· 98768f68
Martin Flöser
authored
Jan 08, 2014
Conflicts: ksmserver/screenlocker/ksldapp.cpp
98768f68