Merge branch 'patch-1' into persist-zmq

Conflicts: opencog/persist/zmq/atomspace/ZMQClient.cc opencog/persist/zmq/atomspace/ZMQPersistSCM.h
ceefour · Aug 25, 2015 · 2089f94 · 2089f94
2 parents 532ef59 + b7c8ccf
commit 2089f94
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/opencog/persist/zmq/atomspace/ZMQClient.cc b/opencog/persist/zmq/atomspace/ZMQClient.cc
@@ -2,7 +2,10 @@
  * FUNCTION:
  * Persistent Atom storage, ZeroMQ-backed e.g. Neo4j.
  *
- * Copyright (c) 2015 Erwin Joosten, Hendy Irawan <ceefour666@gmail.com>
+ * Copyright (C) 2008-2015 OpenCog Foundation
+ * All Rights Reserved
+ *
+ * Written by Erwin Joosten, Hendy Irawan <ceefour666@gmail.com>
  *
  * LICENSE:
  * This program is free software; you can redistribute it and/or modify

diff --git a/opencog/persist/zmq/atomspace/ZMQClient.h b/opencog/persist/zmq/atomspace/ZMQClient.h
@@ -3,7 +3,10 @@
  * Base class for ZeroMQ-backed persistent storage.
  *
  * HISTORY:
- * Copyright (c) 2015 Erwin Joosten, Hendy Irawan <ceefour666@gmail.com>
+ * Copyright (C) 2008-2015 OpenCog Foundation
+ * All Rights Reserved
+ *
+ * Written by Erwin Joosten, Hendy Irawan <ceefour666@gmail.com>
  *
  * LICENSE:
  * This program is free software; you can redistribute it and/or modify