comparison etc/emacs.desktop @ 109388:64d1dc916ed8

Fix previous conflict.
author Kenichi Handa <handa@etlken>
date Wed, 14 Jul 2010 12:53:53 +0900
parents 385097a8a31f
children
comparison
equal deleted inserted replaced
109387:2bc66123f2c6 109388:64d1dc916ed8