annotate db/dom/ano/onet/ns/ns.onet.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 824811bd9163
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
722
824811bd9163 added as14 for Obee, added onet.ano and NS entry for it, added ip ranges 1.1.14.0 and 1.1.66.0
Obee <obee@anomail.ano>
parents:
diff changeset
1 1.1.12.2