Fix previous conflict.
[bpt/emacs.git] / src / deps.mk
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...
2010-06-09 Andreas SchwabMerge from emacs-23
2010-06-01 Stefan MonnierMerge from emacs-23
2010-05-27 Kenichi Handamerge trunk
2010-05-27 Glenn MorrisDo not preprocess src/Makefile.in.
2010-05-25 Stefan MonnierMerge from emacs-23
2010-05-25 Kenichi Handamerge trunk
2010-05-22 Eli ZaretskiiRedesign bidi-aware edge positions of glyph rows, fix...
2010-05-20 Glenn Morris* src/autodeps.mk, src/deps.mk: Comments need to be...
2010-05-20 Glenn MorrisHandle auto-depend with configure.