← Back to branch summary

~greg.grossmeier/exempi/trunk

Viewing all changes in revision 189.

  • Committer: Hubert Figuière
  • Date: 2014-09-01 04:00:26 UTC
  • mfrom: (181.1.12)
  • Revision ID: git-v1:3cc479d6c3bef6d1d42fd94c44d9dee2c2bab229
Merge branch 'exempi-2.3-branch'

Conflicts:
        XMPFiles/source/FormatSupport/TIFF_MemoryReader.cpp

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: