Mercurial > emacs
comparison nt/inc/langinfo.h @ 108947:ca556d6b7c7a
Conflict resolution fixup
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 10 Jun 2010 00:34:08 +0200 |
parents | aeceb2460b39 |
children | 376148b31b5e |
comparison
equal
deleted
inserted
replaced
108946:d418516def73 | 108947:ca556d6b7c7a |
---|