diff options
author | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
---|---|---|
committer | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
commit | 0703404654d2a40cacae2d94c6e0e22ca28b4acf (patch) | |
tree | bfdbe1e8952814f73a6b0e190ae0a77fd0cfc7bd /riscos/distribution/3rdParty/Iconv | |
parent | 54f719aa960159c5b1978846223732c9669ca7fa (diff) | |
parent | 89856f55929907642013e45435b9d18cd1fafe36 (diff) | |
download | netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.gz netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.bz2 |
Merge branch 'master' into mono/removing-windom-dependencymono/removing-windom-dependency
Conflicts:
atari/toolbar.c
Diffstat (limited to 'riscos/distribution/3rdParty/Iconv')
-rw-r--r-- | riscos/distribution/3rdParty/Iconv/ReadMe | 2 | ||||
-rw-r--r-- | riscos/distribution/3rdParty/Iconv/doc/ChangeLog | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/riscos/distribution/3rdParty/Iconv/ReadMe b/riscos/distribution/3rdParty/Iconv/ReadMe index fda952a4c..907c2c7c8 100644 --- a/riscos/distribution/3rdParty/Iconv/ReadMe +++ b/riscos/distribution/3rdParty/Iconv/ReadMe @@ -24,7 +24,7 @@ See the ReadMe file in that directory for further information. Licence ======= -Iconv is Copyright © 2004-11 J-M Bell +Iconv is Copyright © 2004-13 J-M Bell Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/riscos/distribution/3rdParty/Iconv/doc/ChangeLog b/riscos/distribution/3rdParty/Iconv/doc/ChangeLog index 4c17511d9..3a22a45fa 100644 --- a/riscos/distribution/3rdParty/Iconv/doc/ChangeLog +++ b/riscos/distribution/3rdParty/Iconv/doc/ChangeLog @@ -105,3 +105,10 @@ Iconv Changelog - Toolchain used to build 0.10 turns out to have produced broken code. - Minor additions to the charset alias mapping file. +0.12 20-Jan-2013 +--------------- + + - Master alias mapping file now lives in ROOL repository. + - Correct handling of trailing valid shift sequences. Previously would + erroneously report EINVAL, instead of silently accepting them. + - Add proper transliteration behaviour when requested using //TRANSLIT. |