Commit 4f54f7b3 authored by Glenn Morris's avatar Glenn Morris

Restore ChangeLog entry clobbered earlier today.

parent ab882ed2
......@@ -59,6 +59,11 @@
* progmodes/cc-align.el (c-lineup-respect-col-0): New function.
2014-12-01 Lars Magne Ingebrigtsen <>
* net/shr.el (shr-dom-print): Fix up `shr-dom-print' after the
dom.el changes.
2014-12-01 Stefan Monnier <>
* vc/vc.el (vc-find-conflicted-file): Look for conflicted files in the
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment