aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorEli Zaretskii2012-10-20 13:49:12 +0200
committerEli Zaretskii2012-10-20 13:49:12 +0200
commit87c6b4e6bd7e023bd57c709bb6af59bca27bf4f6 (patch)
treef55ed6544c4e66f1e459b49ae08aced3ac5f36f1 /lib-src
parent81f8ee3ff0b25c479c6a8095d32d762610009e29 (diff)
parent6ec83f926d5ff699901fb530162d7f1bdfa85808 (diff)
parent3503c798921ee6b8f1cc960d9406b69623eb5470 (diff)
downloademacs-87c6b4e6bd7e023bd57c709bb6af59bca27bf4f6.tar.gz
emacs-87c6b4e6bd7e023bd57c709bb6af59bca27bf4f6.zip
Merge from trunk.