diff options
author | lex <lex@lynx.ano> | 2011-01-12 06:13:51 -0600 |
---|---|---|
committer | lex <lex@lynx.ano> | 2011-01-12 06:13:51 -0600 |
commit | 8c1e26c307581550eff883101a625103d4ded220 (patch) | |
tree | b9b56bd13a405b669b0ccb5633c0387037123066 | |
parent | 0fa438c596a8867ee5e8804bff5b7e30a9f3146d (diff) | |
parent | 113fb85a35a6be7e26840f728bb7655070da4c9a (diff) | |
download | resdb-8c1e26c307581550eff883101a625103d4ded220.tar.gz resdb-8c1e26c307581550eff883101a625103d4ded220.zip |
Merge branch 'master' of git://1.0.27.102
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | db/as/62487/owner | 1 | ||||
-rw-r--r-- | db/dom/ano/search/ns/ns1.search.ano | 2 | ||||
-rw-r--r-- | db/dom/ano/search/owner | 2 | ||||
-rw-r--r-- | db/usr/atiti/git | 1 | ||||
-rwxr-xr-x | git-commit | 2 |
6 files changed, 7 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..23ec47a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +conf +export diff --git a/db/as/62487/owner b/db/as/62487/owner new file mode 100644 index 0000000..ee17603 --- /dev/null +++ b/db/as/62487/owner @@ -0,0 +1 @@ +Atiti diff --git a/db/dom/ano/search/ns/ns1.search.ano b/db/dom/ano/search/ns/ns1.search.ano index bff3026..1849862 100644 --- a/db/dom/ano/search/ns/ns1.search.ano +++ b/db/dom/ano/search/ns/ns1.search.ano @@ -1 +1 @@ -1.0.9.50 +1.1.123.1 diff --git a/db/dom/ano/search/owner b/db/dom/ano/search/owner index 0af709e..b0d3019 100644 --- a/db/dom/ano/search/owner +++ b/db/dom/ano/search/owner @@ -1 +1 @@ -rn_zippy +atiti diff --git a/db/usr/atiti/git b/db/usr/atiti/git new file mode 100644 index 0000000..c757dfe --- /dev/null +++ b/db/usr/atiti/git @@ -0,0 +1 @@ +git://1.1.123.1/ @@ -1,4 +1,4 @@ #!/bin/sh -git add configure db doc git-commit gitd scripts contrib +git add configure db doc git-commit gitd scripts contrib .gitignore git commit test -x /usr/lib/git-core/git-update-server-info && /usr/lib/git-core/git-update-server-info |