diff options
author | pragmo <me@pragmo.ano> | 2011-02-15 03:40:44 +0000 |
---|---|---|
committer | pragmo <me@pragmo.ano> | 2011-02-15 03:40:44 +0000 |
commit | 266724473d2ec28318bcbb54a63be53856c69835 (patch) | |
tree | dcbeec8b5ca162b6cfde0ce64459fbfbde1806c5 | |
parent | d78085792792cb563dfd48e79b3ae820c44648ab (diff) | |
parent | d364a9c8dfe2c00e64388cb51b1bd097924aace9 (diff) | |
download | resdb-266724473d2ec28318bcbb54a63be53856c69835.tar.gz resdb-266724473d2ec28318bcbb54a63be53856c69835.zip |
Merge branch 'master' of git://1.33.92.1
-rw-r--r-- | db/as/170/owner | 1 | ||||
-rw-r--r-- | db/ip/01/00/AA/cidr | 1 | ||||
-rw-r--r-- | db/ip/01/00/AA/owner | 1 | ||||
-rw-r--r-- | db/usr/harald/git | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/db/as/170/owner b/db/as/170/owner new file mode 100644 index 0000000..d96e291 --- /dev/null +++ b/db/as/170/owner @@ -0,0 +1 @@ +harald diff --git a/db/ip/01/00/AA/cidr b/db/ip/01/00/AA/cidr new file mode 100644 index 0000000..d7d027f --- /dev/null +++ b/db/ip/01/00/AA/cidr @@ -0,0 +1 @@ +1.0.170.0/24 diff --git a/db/ip/01/00/AA/owner b/db/ip/01/00/AA/owner new file mode 100644 index 0000000..d96e291 --- /dev/null +++ b/db/ip/01/00/AA/owner @@ -0,0 +1 @@ +harald diff --git a/db/usr/harald/git b/db/usr/harald/git index 45d11d3..7f1e0a9 100644 --- a/db/usr/harald/git +++ b/db/usr/harald/git @@ -1 +1 @@ -git://1.0.169.1/ano2.git +git://1.0.169.14/ano.git |