Merge branch 'gucharmap-files'
authorJoachim Breitner <mail@joachim-breitner.de>
Tue, 8 Dec 2009 22:19:16 +0000 (23:19 +0100)
committerJoachim Breitner <mail@joachim-breitner.de>
Tue, 8 Dec 2009 22:19:16 +0000 (23:19 +0100)
commit2be407122b7cb6cecfa143dde5b816fee26d8209
tree5d863cb4ce3e1b6fef23b817921c18cd55c74554
parent2406ad4fe9158206ae1020513aaadc7c95a55fd4
parent93123c398e65fab757e95cf41a283608451b79ad
Merge branch 'gucharmap-files'

Conflicts:
unicode-names.h
unicode-names.h