~neon/kdegraphics/gwenview

Viewing all changes in revision 3290.

  • Committer: Aurélien Gâteau
  • Date: 2016-11-23 08:21:41 UTC
  • mfrom: (3219.1.22)
  • Revision ID: git-v1:9b67885f1c846253df392af995d714be77c417c7
Merge branch 'bring-back-importer'

# Conflicts:
#       CMakeLists.txt

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: