Skip to content
GitLab
Explore
Sign in
Plasma
libkscreen
Commits
2fe004da
Commit
2fe004da
authored
Jan 08, 2015
by
Jonathan Riddell
🛶
Browse files
Merge branch 'frameworks'
Conflicts: CMakeLists.txt
parents
257aae50
8325c8b7
Changes
99
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment