diff make-dist @ 83356:df547ba04c0f

Add =upstream-branch file for semi-automated merges. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-396
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 05 Sep 2005 14:28:54 +0000
parents 385af3e03206
children 00005df1b3eb 890cc78a5a24
line wrap: on
line diff