Mercurial > hg > anonet-resdb
changeset 364:4fbc2e8407b0 draft
Merge branch 'master' of git://1.0.27.102
| author | lex <lex@lynx.ano> |
|---|---|
| date | Wed, 12 Jan 2011 06:13:51 -0600 |
| parents | 59102e1e06f9 (current diff) 30b747e3c5d6 (diff) |
| children | c35fdaa5fc48 6e2661e2a726 |
| files | |
| diffstat | 6 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.gitignore Wed Jan 12 06:13:51 2011 -0600 @@ -0,0 +1,2 @@ +conf +export
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/as/62487/owner Wed Jan 12 06:13:51 2011 -0600 @@ -0,0 +1,1 @@ +Atiti
--- a/db/dom/ano/search/ns/ns1.search.ano Tue Jan 11 14:08:40 2011 -0600 +++ b/db/dom/ano/search/ns/ns1.search.ano Wed Jan 12 06:13:51 2011 -0600 @@ -1,1 +1,1 @@ -1.0.9.50 +1.1.123.1
--- a/db/dom/ano/search/owner Tue Jan 11 14:08:40 2011 -0600 +++ b/db/dom/ano/search/owner Wed Jan 12 06:13:51 2011 -0600 @@ -1,1 +1,1 @@ -rn_zippy +atiti
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/usr/atiti/git Wed Jan 12 06:13:51 2011 -0600 @@ -0,0 +1,1 @@ +git://1.1.123.1/
--- a/git-commit Tue Jan 11 14:08:40 2011 -0600 +++ b/git-commit Wed Jan 12 06:13:51 2011 -0600 @@ -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