# HG changeset patch # User gain # Date 1324340668 25200 # Node ID 038435e8c364cbe9f1544b941ba6a079c459b6f3 # Parent 1f04a2c3e60199a4480bb9308b83fef8c2721e5f# Parent 4c4bac5bea731de8121e7cb1ff5ed59861eca9b1 Merge branch 'master' of git://git1.somerandomnick.ano/ diff -r 1f04a2c3e601 -r 038435e8c364 db/udpmsg4/Cryto/@/.gitignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/Cryto/@/.gitignore Mon Dec 19 17:24:28 2011 -0700 @@ -0,0 +1,1 @@ +temp.keys diff -r 1f04a2c3e601 -r 038435e8c364 db/udpmsg4/Cryto/@/default.key --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/Cryto/@/default.key Mon Dec 19 17:24:28 2011 -0700 @@ -0,0 +1,1 @@ +94e3d6af6861a3e8fd36ca67546771f25e0cf464d02ea980a4b699688e93860b diff -r 1f04a2c3e601 -r 038435e8c364 db/udpmsg4/Cryto/@/owner --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/Cryto/@/owner Mon Dec 19 17:24:28 2011 -0700 @@ -0,0 +1,1 @@ +somerandomnick diff -r 1f04a2c3e601 -r 038435e8c364 db/udpmsg4/Cryto/@/path --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/udpmsg4/Cryto/@/path Mon Dec 19 17:24:28 2011 -0700 @@ -0,0 +1,1 @@ +/Cryto