Mercurial > hg > anonet-resdb
annotate db/dom/ano/negromancy/owner @ 1119:5645d1ed79c5 draft
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 | f33ac358063d |
children |
rev | line source |
---|---|
1046
f33ac358063d
new file: db/dom/ano/negromancy/ns/a.ns.talamon.ano
talamon <nobody@nowhere>
parents:
diff
changeset
|
1 talamon |