# HG changeset patch
# User epoch <epoch@hacking.allowed.org>
# Date 1369363187 0
# Node ID 5645d1ed79c525002b0a5b48ef1ad5c4abb6ae02
# Parent  c6666d29e9c698323f9957a7e99268b85e7fae01# Parent  98f2113fb0c12a3d929646966b41d8b0554a0bd5
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

diff -r c6666d29e9c6 -r 5645d1ed79c5 db/dom/ano/drugs/ns/a.ns.drugs.ano
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/drugs/ns/a.ns.drugs.ano	Fri May 24 02:39:47 2013 +0000
@@ -0,0 +1,1 @@
+1.79.3.153
diff -r c6666d29e9c6 -r 5645d1ed79c5 db/dom/ano/drugs/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/drugs/owner	Fri May 24 02:39:47 2013 +0000
@@ -0,0 +1,1 @@
+somebody
diff -r c6666d29e9c6 -r 5645d1ed79c5 db/dom/drugs/pcp/ns/a.ns.pcp.drugs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/drugs/pcp/ns/a.ns.pcp.drugs	Fri May 24 02:39:47 2013 +0000
@@ -0,0 +1,1 @@
+1.79.3.153
diff -r c6666d29e9c6 -r 5645d1ed79c5 db/dom/drugs/pcp/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/drugs/pcp/owner	Fri May 24 02:39:47 2013 +0000
@@ -0,0 +1,1 @@
+somebody
diff -r c6666d29e9c6 -r 5645d1ed79c5 scripts/add_dom
--- a/scripts/add_dom	Sun May 12 09:46:28 2013 +0000
+++ b/scripts/add_dom	Fri May 24 02:39:47 2013 +0000
@@ -5,7 +5,7 @@
 fi
 
 dir=db/dom/"$(echo "$1" | tr . '\n' | tac | tr '\n' / | ./scripts/head_-c_-1)"
-mkdir "$dir" || exit 1
+mkdir -p "$dir" || exit 1
 echo "$2" > "$dir/owner"
 mkdir "$dir/ns" || exit 1
 shift; shift;