Skip to content
GitLab
Explore
Sign in
Education
KTouch
Commits
3ad86dc0
Commit
3ad86dc0
authored
Nov 22, 2016
by
Sebastian Gottfried
Browse files
Merge Branch 'Applications/16.12'
# Conflicts: # CMakeLists.txt
parents
ceabd159
4cb4b32d
Changes
1
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