Mercurial > hg > xemacs-beta
diff etc/sample.Xresources @ 5121:c6c982484f87 ben-lisp-object
manually resolve merge problem
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 30 Dec 2009 04:27:30 -0600 |
| parents | f15523a6da7a |
| children | 4ed2dedf36a1 |
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 30 Dec 2009 04:27:30 -0600 |
| parents | f15523a6da7a |
| children | 4ed2dedf36a1 |