changeset 965:dbfcb0dacc4f draft

Merge branch 'master' of git://git.d3v11.ano
author root <root@ip-10-56-75-16.(none)>
date Sun, 22 Jul 2012 21:54:23 +0000
parents 5f1978718649 (current diff) e0ebe6d65ebe (diff)
children 1222f89dcdab
files db/udpmsg4/NeXus/@/.gitignore db/udpmsg4/NeXus/@/default.key db/udpmsg4/NeXus/@/owner db/udpmsg4/NeXus/@/path
diffstat 8 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/.gitignore	Sun Jul 22 21:54:23 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/default.key	Sun Jul 22 21:54:23 2012 +0000
@@ -0,0 +1,1 @@
+ab6f47bcfd1a50ae62762bd94c4a8ec5e2b5bf60cb97aae2d4f52fa519fd447f
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/owner	Sun Jul 22 21:54:23 2012 +0000
@@ -0,0 +1,1 @@
+mama
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/path	Sun Jul 22 21:54:23 2012 +0000
@@ -0,0 +1,1 @@
+/NeXus
--- a/db/udpmsg4/NeXus/@/.gitignore	Sun Jul 22 21:41:57 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-temp.keys
--- a/db/udpmsg4/NeXus/@/default.key	Sun Jul 22 21:41:57 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-ab6f47bcfd1a50ae62762bd94c4a8ec5e2b5bf60cb97aae2d4f52fa519fd447f
--- a/db/udpmsg4/NeXus/@/owner	Sun Jul 22 21:41:57 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-mama
--- a/db/udpmsg4/NeXus/@/path	Sun Jul 22 21:41:57 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/NeXus