comparison .bzrignore @ 106981:e3fcbe16deae

merge conflict
author Mark A. Hershberger <mhershberger@intrahealth.org>
date Sun, 24 Jan 2010 23:52:26 -0500
parents d026329addd9
children 3b5ef09ea743
comparison
equal deleted inserted replaced
106980:66e0d01014c6 106981:e3fcbe16deae
59 src/emacs-* 59 src/emacs-*
60 src/prefix-args* 60 src/prefix-args*
61 src/stamp-oldxmenu 61 src/stamp-oldxmenu
62 src/temacs 62 src/temacs
63 src/deps 63 src/deps
64 configure.lineno