Fix previous conflict.
[bpt/emacs.git] / src / biditype.h
2010-07-10 Chong YidongMerge changes from emacs-23 branch.
2010-06-26 Eli Zaretskiiw32-fns.el (w32-convert-standard-filename): Doc fix.
2010-06-16 Stefan MonnierMerge from emacs-23
2010-06-13 Eli ZaretskiiUse Unicode database for attribute tables in bidi.c.
2010-06-12 Eli ZaretskiiUse BidiMirroring.txt for mirroring characters in bidi...