← Back to branch summary

~neon/ktouch/master

Viewing all changes in revision 1098.

  • Committer: Sebastian Gottfried
  • Date: 2016-11-30 12:02:21 UTC
  • mfrom: (1089.1.7)
  • Revision ID: git-v1:0805d41ca73defcfa16966310d6935b4e9a4e418
Merge Branch 'Applications/16.12'

# Conflicts:
#       CMakeLists.txt

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: