changeset 939:99b51e3a010c draft

Merge git://1.5.5.20
author Nick <nick@somerandomnick.ano>
date Wed, 14 Mar 2012 01:21:01 +0000
parents 8fa1b48247d7 (current diff) 6d48f20556a6 (diff)
children 3a2b5cd0ad4d
files
diffstat 6 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/db/dom/ano/wakawaka/ns/ns1.wakawaka.ano	Wed Mar 14 00:41:48 2012 +0000
+++ b/db/dom/ano/wakawaka/ns/ns1.wakawaka.ano	Wed Mar 14 01:21:01 2012 +0000
@@ -1,1 +1,1 @@
-1.0.111.1
+1.5.5.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/WWW/@/.gitignore	Wed Mar 14 01:21:01 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/WWW/@/default.key	Wed Mar 14 01:21:01 2012 +0000
@@ -0,0 +1,1 @@
+afd015793b655c87b0a71f596593c1b6214c7d2835766b8502abdba4b437d014
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/WWW/@/owner	Wed Mar 14 01:21:01 2012 +0000
@@ -0,0 +1,1 @@
+wakawaka
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/WWW/@/path	Wed Mar 14 01:21:01 2012 +0000
@@ -0,0 +1,1 @@
+/WWW
--- a/db/usr/wakawaka/git	Wed Mar 14 00:41:48 2012 +0000
+++ b/db/usr/wakawaka/git	Wed Mar 14 01:21:01 2012 +0000
@@ -1,1 +1,1 @@
-git://1.9.9.1/.git/
+git://1.5.5.1/.git/