summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorMarti Maria <info@littlecms.com>2013-05-13 12:01:21 +0200
committerMarti Maria <info@littlecms.com>2013-05-13 12:01:21 +0200
commit861a932020b8da50328b44ad26e1f41fb1cc3191 (patch)
tree30b67fc51385133ce2994ac57cb6b32f28bc3d22 /ChangeLog
parentf54d4b0a44df66ce8f47750669ccd80c12127c47 (diff)
downloadlcms2-861a932020b8da50328b44ad26e1f41fb1cc3191.tar.gz
Clean tabs & format after the GIT merge disaster
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 1 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6cb877e..3d6f1be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -106,3 +106,4 @@ More changes from Artifex
Added TIFF Lab16 handling on tifficc
Added some fixes from XhmikosR
Fixed a bug in parametric curves
+Remove spurious tabs added by git merge of pull request