Mercurial > emacs
diff src/s/sco4.h @ 83655:67f4cd925834
Fix 2007-08-21 merge conflicts.
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Wed, 22 Aug 2007 23:45:47 +0000 |
parents | f06998349cfc |
children | 68df465b9550 503ef2cfbfc1 f55f9811f5d7 |
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Wed, 22 Aug 2007 23:45:47 +0000 |
parents | f06998349cfc |
children | 68df465b9550 503ef2cfbfc1 f55f9811f5d7 |