]> code.delx.au - gnu-emacs/commit
Merge from trunk, resolve conflicts.
authorEli Zaretskii <eliz@gnu.org>
Sun, 14 Apr 2013 17:27:45 +0000 (20:27 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sun, 14 Apr 2013 17:27:45 +0000 (20:27 +0300)
commiteb7a410c147507ffdf0e84d163a014acb82b19a2
tree2274bf05e320123c234afbe38dc97932b943c0ea
parent64544985029d58bada3486a3eba7f11ce690c526
parentddd6b68524ba1f957e2f8ddd76eb23e641429b58
Merge from trunk, resolve conflicts.
configure.ac
lib/Makefile.am
src/Makefile.in