diff options
| author | epoch <epoch@hacking.allowed.org> | 2013-05-24 02:39:47 +0000 |
|---|---|---|
| committer | epoch <epoch@hacking.allowed.org> | 2013-05-24 02:39:47 +0000 |
| commit | 59c1751062b903e3e009afd6ec0effb3bf29f1c0 (patch) | |
| tree | 5cdca1832eefcedd01c560264a2f2dabc855e0b9 /scripts/nameserver_autogen | |
| parent | b09ebf67a7b0036f2f0f539ec6ee95d02d4c0cba (diff) | |
| parent | a1eca4f2b495baa4f98e228e393a17f06ad3e95b (diff) | |
| download | resdb-59c1751062b903e3e009afd6ec0effb3bf29f1c0.tar.gz resdb-59c1751062b903e3e009afd6ec0effb3bf29f1c0.zip | |
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
Diffstat (limited to 'scripts/nameserver_autogen')
0 files changed, 0 insertions, 0 deletions