diff options
| author | Ivo Smits <Ivo@UCIS.nl> | 2011-01-12 14:24:42 +0100 |
|---|---|---|
| committer | Ivo Smits <Ivo@UCIS.nl> | 2011-01-12 14:24:42 +0100 |
| commit | 560c6e3deebf9c277b5b1a6ece1cccd6c25fc4fa (patch) | |
| tree | 689f3c380524b878774e0d5291ffec9480d51f5c /db/dom | |
| parent | 6a31d4563708f0e9ebef2bf5184ca012a24f7b3f (diff) | |
| parent | b422ead31b077041cb030064008c6cd26ba058d0 (diff) | |
| download | resdb-560c6e3deebf9c277b5b1a6ece1cccd6c25fc4fa.tar.gz resdb-560c6e3deebf9c277b5b1a6ece1cccd6c25fc4fa.zip | |
Merge branch 'master' of git://git1.somerandomnick.ano
Conflicts:
db/as/62487/owner
Diffstat (limited to 'db/dom')
| -rw-r--r-- | db/dom/ano/search/ns/ns1.search.ano | 2 | ||||
| -rw-r--r-- | db/dom/ano/search/owner | 2 |
2 files changed, 2 insertions, 2 deletions
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 |