Mercurial > hg > anonet-resdb

annotate .gitignore @ 1119:5645d1ed79c5 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
There was some werid stuff with add_dom went with what looked like the best of the conflicting lines. Merge branch 'master' of git://1.4.7.7/resdb Conflicts: scripts/add_dom
author epoch <epoch@hacking.allowed.org>
date Fri, 24 May 2013 02:39:47 +0000
parents 48b9f0dd8f5b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
361
48b9f0dd8f5b added a gitignore to quiet the untracked files warnings
Nick <nick@somerandomnick.ano>
parents:
diff changeset
1 conf
48b9f0dd8f5b added a gitignore to quiet the untracked files warnings
Nick <nick@somerandomnick.ano>
parents:
diff changeset
2 export