Mercurial > emacs
diff src/s/irix5-2.h @ 87135:04590cd6c71c
Resolve commit conflict.
author | Deepak Goel <deego@gnufans.org> |
---|---|
date | Thu, 06 Dec 2007 17:18:13 +0000 |
parents | 695cf19ef79e |
children | 375f2633d815 |
author | Deepak Goel <deego@gnufans.org> |
---|---|
date | Thu, 06 Dec 2007 17:18:13 +0000 |
parents | 695cf19ef79e |
children | 375f2633d815 |