annotate db/dom/ano/fms/ns/a.ns.fms.ano @ 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 1926ce6768d0
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1112
1926ce6768d0 new dns server
SeekingFor <nobody@nowhere>
parents: 1087
diff changeset
1 1.4.9.153